Unit Test - Increase openssl's key size. Place test certs into a common test folder.

Author: Damian Meden

tests/gold_tests/autest-site/trafficserver.test.ext

@@ -162,6 +162,10 @@ def MakeATSProcess(obj, name, command='traffic_server', select_ports=True,
     p.Env['PROXY_CONFIG_SSL_DIR'] = ssl_dir
     p.Variables.SSLDir = ssl_dir
     AddMethodToInstance(p, addSSLfile)
+
+    # Add default cert folder & register handy method.
+    AddMethodToInstance(p, addDefaultSSLFiles)
+    AddMethodToInstance(p, addSSLFileFromDefaultTestFolder)
     ########################################################
     # cache.db directory
     p.Setup.MakeDir(storage_dir)
@@ -461,6 +465,15 @@ def addSSLfile(self, filename):
     self.Setup.CopyAs(filename, self.Variables.SSLDir)
 
 
+def addDefaultSSLFiles(self):
+    addSSLfile(self, os.path.join(self.Variables.AtsTestToolsDir, "ssl", "server.pem"))
+    addSSLfile(self, os.path.join(self.Variables.AtsTestToolsDir, "ssl", "server.key"))
+
+
+def addSSLFileFromDefaultTestFolder(self, filename):
+    addSSLfile(self, os.path.join(self.Variables.AtsTestToolsDir, "ssl", filename))
+
+
 RegisterFileType(Config, "ats:config")
 RegisterFileType(RecordsConfig, "ats:config:records")
 ExtendTest(MakeATSProcess, name="MakeATSProcess")

tests/gold_tests/bigobj/bigobj.test.py

@@ -31,8 +31,7 @@
 
 ts = Test.MakeATSProcess("ts", enable_tls=True)
 
-ts.addSSLfile("ssl/server.pem")
-ts.addSSLfile("ssl/server.key")
+ts.addDefaultSSLFiles()
 
 ts.Disk.records_config.update({
     'proxy.config.diags.debug.enabled': 1,

tests/gold_tests/bigobj/ssl/server.key

@@ -65,8 +65,7 @@
 server3.addResponse("sessionlog.json", request_header3, response_header3)
 
 # add ssl materials like key, certificates for the server
-ts.addSSLfile("ssl/server.pem")
-ts.addSSLfile("ssl/server.key")
+ts.addDefaultSSLFiles()
 
 ts.Disk.records_config.update({
     'proxy.config.diags.debug.enabled': 1,

tests/gold_tests/bigobj/ssl/server.pem

@@ -32,8 +32,7 @@
 ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
 
 # add ssl materials like key, certificates for the server
-ts.addSSLfile("ssl/server.pem")
-ts.addSSLfile("ssl/server.key")
+ts.addDefaultSSLFiles()
 
 ts.Disk.records_config.update({
     'proxy.config.http2.enabled': 1,    # this option is for VZM-internal only

tests/gold_tests/chunked_encoding/chunked_encoding.test.py

@@ -40,8 +40,7 @@
 server.addResponse("sessionfile.log", request_header, response_header)
 
 # add ssl materials like key, certificates for the server
-ts.addSSLfile("ssl/server.pem")
-ts.addSSLfile("ssl/server.key")
+ts.addDefaultSSLFiles()
 
 # add port and remap rule
 ts.Disk.remap_config.AddLine(

tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py

@@ -40,8 +40,7 @@
                    "timestamp": "1469733493.993", "body": ""}
 
 # add ssl materials like key, certificates for the server
-ts.addSSLfile("ssl/server.pem")
-ts.addSSLfile("ssl/server.key")
+ts.addDefaultSSLFiles()
 
 Test.PrepareTestPlugin(os.path.join(Test.Variables.AtsTestPluginsDir,
                                     'ssntxnorder_verify.so'), ts)