Repository: trafficserver Updated Branches: refs/heads/master 5722870ef -> d6c84e053
More pylint fixes to brin tsqa-lint back to passing Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/d6c84e05 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/d6c84e05 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/d6c84e05 Branch: refs/heads/master Commit: d6c84e05386d32d20d092b73abd17d3112533e59 Parents: 5722870 Author: Thomas Jackson <[email protected]> Authored: Fri Jul 10 16:19:56 2015 -0700 Committer: Thomas Jackson <[email protected]> Committed: Fri Jul 10 16:19:56 2015 -0700 ---------------------------------------------------------------------- ci/tsqa/tests/test_cache_generation.py | 6 +++--- ci/tsqa/tests/test_tls_ticket_key_rotation.py | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6c84e05/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 8757eac..5e9a39c 100644 --- a/ci/tsqa/tests/test_cache_generation.py +++ b/ci/tsqa/tests/test_cache_generation.py @@ -53,8 +53,9 @@ class TestCacheGeneration(helpers.EnvironmentCase): def _ctl(self, *args): cmd = [os.path.join(self.environment.layout.bindir, 'traffic_ctl')] + list(args) - out, _ = tsqa.utils.run_sync_command(cmd, - env=self.environment.shell_env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT + out, _ = tsqa.utils.run_sync_command( + cmd, + env=self.environment.shell_env, stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) return out @@ -156,4 +157,3 @@ class TestCacheGeneration(helpers.EnvironmentCase): gencount = gencount + 1 self.assertNotEqual(gencount, 0, msg='proxy.config.http.cache.generation never updated') - http://git-wip-us.apache.org/repos/asf/trafficserver/blob/d6c84e05/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 442732d..3fe98ce 100644 --- a/ci/tsqa/tests/test_tls_ticket_key_rotation.py +++ b/ci/tsqa/tests/test_tls_ticket_key_rotation.py @@ -17,13 +17,12 @@ from OpenSSL import SSL import socket import subprocess -import time import helpers import tsqa.utils import os -import tsqa.utils + # helper function to get the path of a program. def which(program): @@ -40,10 +39,12 @@ def which(program): if is_exe(exe_file): return exe_file return None -""" - Test TLS session resumption through session tickets and TLS ticket key rotation. -""" + + class TestTLSTicketKeyRotation(helpers.EnvironmentCase): + """ + Test TLS session resumption through session tickets and TLS ticket key rotation. + """ @classmethod def setUpEnv(cls, env): ''' @@ -80,7 +81,7 @@ class TestTLSTicketKeyRotation(helpers.EnvironmentCase): # openssl s_client -connect 127.0.0.1:443 -tls1 < /dev/null sess = os.path.join(self.environment.layout.logdir, 'sess') - ticket_cmd = 'echo | openssl s_client -connect {0}:{1} -sess_out {2}'.format(addr[0], addr[1], sess); + ticket_cmd = 'echo | openssl s_client -connect {0}:{1} -sess_out {2}'.format(addr[0], addr[1], sess) # check whether TLS session tickets are received by s_client. stdout, _ = tsqa.utils.run_sync_command(ticket_cmd, stdout=subprocess.PIPE, shell=True) @@ -94,7 +95,7 @@ class TestTLSTicketKeyRotation(helpers.EnvironmentCase): # check whether the session has been reused reused = False - ticket_cmd = 'echo | openssl s_client -connect {0}:{1} -sess_in {2}'.format(addr[0], addr[1], sess); + ticket_cmd = 'echo | openssl s_client -connect {0}:{1} -sess_in {2}'.format(addr[0], addr[1], sess) stdout, _ = tsqa.utils.run_sync_command(ticket_cmd, stdout=subprocess.PIPE, shell=True) for line in stdout.splitlines(): text = line.strip() @@ -105,7 +106,7 @@ class TestTLSTicketKeyRotation(helpers.EnvironmentCase): # negative test case. The session is not reused. reused = False - ticket_cmd = 'echo | openssl s_client -connect {0}:{1}'.format(addr[0], addr[1]); + ticket_cmd = 'echo | openssl s_client -connect {0}:{1}'.format(addr[0], addr[1]) stdout, _ = tsqa.utils.run_sync_command(ticket_cmd, stdout=subprocess.PIPE, shell=True) for line in stdout.splitlines(): text = line.strip() @@ -136,7 +137,7 @@ class TestTLSTicketKeyRotation(helpers.EnvironmentCase): # Check whether the config file exists. self.assertTrue(os.path.isfile(ssl_multicert), ssl_multicert) - touch_cmd = which('touch') + ' ' + ssl_multicert + touch_cmd = which('touch') + ' ' + ssl_multicert tsqa.utils.run_sync_command(touch_cmd, stdout=subprocess.PIPE, shell=True) count = 0
