You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ja...@apache.org on 2015/04/20 23:21:55 UTC
[3/4] trafficserver git commit: Style cleanup
Style cleanup
This closes #186
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/ea54eefe
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/ea54eefe
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/ea54eefe
Branch: refs/heads/master
Commit: ea54eefea7eecaae992a7bb2ba9b9b57a204a9a0
Parents: 98c87a7
Author: Thomas Jackson <ja...@apache.org>
Authored: Mon Apr 13 13:23:02 2015 -0700
Committer: Thomas Jackson <ja...@apache.org>
Committed: Mon Apr 20 14:21:14 2015 -0700
----------------------------------------------------------------------
ci/new_tsqa/tests/test_https.py | 36 ++++++++++++++++++++++++++++--------
1 file changed, 28 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/ea54eefe/ci/new_tsqa/tests/test_https.py
----------------------------------------------------------------------
diff --git a/ci/new_tsqa/tests/test_https.py b/ci/new_tsqa/tests/test_https.py
index 619d327..a8914e6 100644
--- a/ci/new_tsqa/tests/test_https.py
+++ b/ci/new_tsqa/tests/test_https.py
@@ -134,11 +134,21 @@ class TestRSA(helpers.EnvironmentCase, CertSelectionMixin):
})
# configure SSL multicert
- cls.configs['ssl_multicert.config'].add_line('dest_ip=127.0.0.2 ssl_cert_name={0} ssl_ca_name={1}'.format(helpers.tests_file_path('rsa_keys/www.example.com.pem'), helpers.tests_file_path('rsa_keys/intermediate.crt')))
- cls.configs['ssl_multicert.config'].add_line('dest_ip=127.0.0.2 ssl_cert_name={0}'.format(helpers.tests_file_path('rsa_keys/www.test.com.pem')))
+ cls.configs['ssl_multicert.config'].add_line('dest_ip=127.0.0.2 ssl_cert_name={0} ssl_ca_name={1}'.format(
+ helpers.tests_file_path('rsa_keys/www.example.com.pem'),
+ helpers.tests_file_path('rsa_keys/intermediate.crt'),
+ ))
+ cls.configs['ssl_multicert.config'].add_line('dest_ip=127.0.0.2 ssl_cert_name={0}'.format(
+ helpers.tests_file_path('rsa_keys/www.test.com.pem'),
+ ))
- cls.configs['ssl_multicert.config'].add_line('dest_ip=* ssl_cert_name={0} ssl_ca_name={1}'.format(helpers.tests_file_path('rsa_keys/www.example.com.pem'), helpers.tests_file_path('rsa_keys/intermediate.crt')))
- cls.configs['ssl_multicert.config'].add_line('dest_ip=* ssl_cert_name={0}'.format(helpers.tests_file_path('rsa_keys/www.test.com.pem')))
+ cls.configs['ssl_multicert.config'].add_line('dest_ip=* ssl_cert_name={0} ssl_ca_name={1}'.format(
+ helpers.tests_file_path('rsa_keys/www.example.com.pem'),
+ helpers.tests_file_path('rsa_keys/intermediate.crt'),
+ ))
+ cls.configs['ssl_multicert.config'].add_line('dest_ip=* ssl_cert_name={0}'.format(
+ helpers.tests_file_path('rsa_keys/www.test.com.pem'),
+ ))
def test_rsa(self):
addr = ('127.0.0.1', self.ssl_port)
@@ -174,11 +184,21 @@ class TestECDSA(helpers.EnvironmentCase, CertSelectionMixin):
})
# configure SSL multicert
- cls.configs['ssl_multicert.config'].add_line('dest_ip=127.0.0.2 ssl_cert_name={0} ssl_ca_name={1}'.format(helpers.tests_file_path('ec_keys/www.example.com.pem'), helpers.tests_file_path('ec_keys/intermediate.crt')))
- cls.configs['ssl_multicert.config'].add_line('dest_ip=127.0.0.2 ssl_cert_name={0}'.format(helpers.tests_file_path('ec_keys/www.test.com.pem')))
+ cls.configs['ssl_multicert.config'].add_line('dest_ip=127.0.0.2 ssl_cert_name={0} ssl_ca_name={1}'.format(
+ helpers.tests_file_path('ec_keys/www.example.com.pem'),
+ helpers.tests_file_path('ec_keys/intermediate.crt'),
+ ))
+ cls.configs['ssl_multicert.config'].add_line('dest_ip=127.0.0.2 ssl_cert_name={0}'.format(
+ helpers.tests_file_path('ec_keys/www.test.com.pem'),
+ ))
- cls.configs['ssl_multicert.config'].add_line('dest_ip=* ssl_cert_name={0} ssl_ca_name={1}'.format(helpers.tests_file_path('ec_keys/www.example.com.pem'), helpers.tests_file_path('ec_keys/intermediate.crt')))
- cls.configs['ssl_multicert.config'].add_line('dest_ip=* ssl_cert_name={0}'.format(helpers.tests_file_path('ec_keys/www.test.com.pem')))
+ cls.configs['ssl_multicert.config'].add_line('dest_ip=* ssl_cert_name={0} ssl_ca_name={1}'.format(
+ helpers.tests_file_path('ec_keys/www.example.com.pem'),
+ helpers.tests_file_path('ec_keys/intermediate.crt'),
+ ))
+ cls.configs['ssl_multicert.config'].add_line('dest_ip=* ssl_cert_name={0}'.format(
+ helpers.tests_file_path('ec_keys/www.test.com.pem'),
+ ))
def test_rsa(self):
addr = ('127.0.0.1', self.ssl_port)