Repository: trafficserver Updated Branches: refs/heads/master 763b8562c -> 5722870ef
Mix tsqa pylint fixes Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/5722870e Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/5722870e Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/5722870e Branch: refs/heads/master Commit: 5722870ef04e666c166348280599a311fc01ff71 Parents: 763b856 Author: Thomas Jackson <[email protected]> Authored: Fri Jul 10 15:56:10 2015 -0700 Committer: Thomas Jackson <[email protected]> Committed: Fri Jul 10 15:56:10 2015 -0700 ---------------------------------------------------------------------- ci/tsqa/tests/test_cache_generation.py | 4 ++-- ci/tsqa/tests/test_hostdb.py | 1 - ci/tsqa/tests/test_regressions.py | 1 + ci/tsqa/tests/test_tls_ticket_key_rotation.py | 1 - 4 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5722870e/ci/tsqa/tests/test_cache_generation.py ---------------------------------------------------------------------- diff --git a/ci/tsqa/tests/test_cache_generation.py b/ci/tsqa/tests/test_cache_generation.py index 6a79485..8757eac 100644 --- a/ci/tsqa/tests/test_cache_generation.py +++ b/ci/tsqa/tests/test_cache_generation.py @@ -40,8 +40,8 @@ class TestCacheGeneration(helpers.EnvironmentCase): def _fetch(self, path): url = 'http://127.0.0.1:{}/{}'.format( - self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'], - path + self.configs['records.config']['CONFIG']['proxy.config.http.server_ports'], + path ) log.debug('get {}'.format(url)) return requests.get(url, headers={'x-debug': 'x-cache,x-cache-key,via,x-cache-generation'}) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5722870e/ci/tsqa/tests/test_hostdb.py ---------------------------------------------------------------------- diff --git a/ci/tsqa/tests/test_hostdb.py b/ci/tsqa/tests/test_hostdb.py index 25ac640..36ec8c8 100644 --- a/ci/tsqa/tests/test_hostdb.py +++ b/ci/tsqa/tests/test_hostdb.py @@ -149,7 +149,6 @@ class TestHostDBHostsFile(helpers.EnvironmentCase, tsqa.test_cases.HTTPBinCase): cls.configs['remap.config'].add_line('map http://local2/ http://local2:{0}/'.format(cls.socket_server.port)) cls.configs['remap.config'].add_line('map http://local3/ http://local3:{0}/'.format(cls.socket_server.port)) - def test_basic(self): ''' Test basic fnctionality of hosts files http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5722870e/ci/tsqa/tests/test_regressions.py ---------------------------------------------------------------------- diff --git a/ci/tsqa/tests/test_regressions.py b/ci/tsqa/tests/test_regressions.py index 64f1a81..e49aa74 100644 --- a/ci/tsqa/tests/test_regressions.py +++ b/ci/tsqa/tests/test_regressions.py @@ -52,6 +52,7 @@ class TestRegressions(helpers.EnvironmentCase): cmd = [os.path.join(self.environment.layout.bindir, 'traffic_server'), '-R', '1'] tsqa.utils.run_sync_command(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + class TestRegressionsLinuxNativeAIO(TestRegressions): ''' Run the built-in traffic_server regression test suite with http://git-wip-us.apache.org/repos/asf/trafficserver/blob/5722870e/ci/tsqa/tests/test_tls_ticket_key_rotation.py ---------------------------------------------------------------------- diff --git a/ci/tsqa/tests/test_tls_ticket_key_rotation.py b/ci/tsqa/tests/test_tls_ticket_key_rotation.py index 3b9bc77..442732d 100644 --- a/ci/tsqa/tests/test_tls_ticket_key_rotation.py +++ b/ci/tsqa/tests/test_tls_ticket_key_rotation.py @@ -14,7 +14,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -import logging from OpenSSL import SSL import socket import subprocess
