Add ts runtimedir path, update existing autest for uds case instead of adding new autest

Author: Serris Lew

tests/CMakeLists.txt

@@ -51,6 +51,7 @@ if(ENABLE_AUTEST_UDS)
     PATTERN "*"
     PATTERN "h2" EXCLUDE
     PATTERN "tls*" EXCLUDE
+    PATTERN "tls/ssl/**"
   )
 else()
   # Copy everything except autest_uds tests that are only for curl uds option
@@ -59,7 +60,6 @@ else()
     DESTINATION ${CMAKE_GOLD_DIR}
     FILES_MATCHING
     PATTERN "*"
-    PATTERN "*_uds.test.py" EXCLUDE
   )
   add_subdirectory(gold_tests_filtered/tls)
 endif()

tests/README.md

@@ -132,7 +132,7 @@ ts=Test.MakeATSProcess("ts")
 #first test is a miss for default
 tr=Test.AddTestRun()
 # get port for command from Variables
-tr.MakeCurlCommand('"http://127.0.0.1:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand('"http://127.0.0.1:{0}" --verbose'.format(ts.Variables.port), uds_path=ts.Variables.uds_path)
 
 ```
 

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

@@ -110,7 +110,7 @@ def PluginExists(self, pluginname):
     return self.Condition(lambda: os.path.isfile(path), path + " not found.")
 
 
-def CurlUds(self):
+def CurlUsingUnixDomainSocket(self):
     return self.Condition(lambda: self.Variables.get("CurlUds", False), "Curl using UDS. Not relevant for test")
 
 
@@ -123,4 +123,4 @@ ExtendCondition(HasCurlVersion)
 ExtendCondition(HasCurlFeature)
 ExtendCondition(HasCurlOption)
 ExtendCondition(PluginExists)
-ExtendCondition(CurlUds)
+ExtendCondition(CurlUsingUnixDomainSocket)

tests/gold_tests/basic/basic.test.py

@@ -25,6 +25,6 @@
 t.StillRunningAfter = Test.Processes.ts
 
 p = t.Processes.Default
-t.MakeCurlCommand("http://127.0.0.1:{0}".format(ts.Variables.port))
+t.MakeCurlCommand("http://127.0.0.1:{0}".format(ts.Variables.port), uds_path=ts.Variables.uds_path)
 p.ReturnCode = 0
 p.StartBefore(Test.Processes.ts)

tests/gold_tests/basic/config.test.py

@@ -21,13 +21,12 @@
 
 ts = Test.MakeATSProcess("ts", select_ports=False)
 ts.Variables.port = 8090
-uds_path = os.path.join(Test.RunDirectory, 'uds.socket')
 ts.Disk.records_config.update({
-    'proxy.config.http.server_ports': str(ts.Variables.port) + f" {uds_path}",
+    'proxy.config.http.server_ports': str(ts.Variables.port) + f" {ts.Variables.uds_path}",
 })
 ts.Ready = When.PortOpen(ts.Variables.port)
 t = Test.AddTestRun("Test traffic server started properly")
 t.Processes.Default.StartBefore(ts)
-t.MakeCurlCommand("127.0.0.1:{port}".format(port=ts.Variables.port))
+t.MakeCurlCommand("127.0.0.1:{port}".format(port=ts.Variables.port), uds_path=ts.Variables.uds_path)
 t.ReturnCode = 0
 t.StillRunningAfter = ts

tests/gold_tests/basic/copy_config.test.py

@@ -22,9 +22,8 @@
 # set up some ATS processes
 ts1 = Test.MakeATSProcess("ts1", select_ports=False)
 ts1.Variables.port = 8090
-uds_path = os.path.join(Test.RunDirectory, 'uds.socket')
 ts1.Disk.records_config.update({
-    'proxy.config.http.server_ports': str(ts1.Variables.port) + f" {uds_path}",
+    'proxy.config.http.server_ports': str(ts1.Variables.port) + f" {ts1.Variables.uds_path}",
 })
 ts1.Ready = When.PortOpen(ts1.Variables.port)
 
@@ -39,7 +38,7 @@
 t = Test.AddTestRun("Talk to ts1")
 t.Processes.Default.StartBefore(ts1)
 t.Processes.Default.StartBefore(ts2)
-t.MakeCurlCommand("127.0.0.1:{port}".format(port=ts1.Variables.port))
+t.MakeCurlCommand("127.0.0.1:{port}".format(port=ts1.Variables.port), uds_path=ts1.Variables.uds_path)
 t.ReturnCode = 0
 t.StillRunningAfter = ts1
 t.StillRunningAfter += ts2

tests/gold_tests/basic/copy_config2.test.py

@@ -27,7 +27,7 @@
 t.StillRunningAfter = ts1
 t.StillRunningAfter += ts2
 p = t.Processes.Default
-t.MakeCurlCommand("127.0.0.1:{0}".format(ts1.Variables.port))
+t.MakeCurlCommand("127.0.0.1:{0}".format(ts1.Variables.port), uds_path=ts1.Variables.uds_path)
 p.ReturnCode = 0
 p.StartBefore(Test.Processes.ts1)
 p.StartBefore(Test.Processes.ts2)
@@ -39,5 +39,5 @@
 t.StillRunningAfter = ts1
 t.StillRunningAfter += ts2
 p = t.Processes.Default
-t.MakeCurlCommand("127.0.0.1:{0}".format(ts2.Variables.port))
+t.MakeCurlCommand("127.0.0.1:{0}".format(ts2.Variables.port), uds_path=ts2.Variables.uds_path)
 p.ReturnCode = 0

tests/gold_tests/bigobj/bigobj.test.py

@@ -64,7 +64,7 @@ def create_pushfile():
 
 
 ipv4flag = ""
-if not Condition.CurlUds():
+if not Condition.CurlUsingUnixDomainSocket():
     ipv4flag = "--ipv4"
 
 tr = Test.AddTestRun("PUSH an object to the cache")
@@ -85,7 +85,7 @@ def create_pushfile():
 tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/1.1 200 OK", "Should fetch pushed object")
 tr.Processes.Default.Streams.All = Testers.ContainsExpression("Content-length: 102400", "Content size should be accurate")
 
-if not Condition.CurlUds():
+if not Condition.CurlUsingUnixDomainSocket():
     tr = Test.AddTestRun("GET bigobj: TLS, HTTP/1.1, IPv4")
     tr.MakeCurlCommand(f'--verbose --ipv4 --http1.1 --insecure https://localhost:{ts.Variables.ssl_port}/bigobj')
     tr.Processes.Default.ReturnCode = 0

tests/gold_tests/bigobj/bigobj_uds.test.py

@@ -20,7 +20,6 @@
 
 Test.Summary = 'Exercise Background Fill'
 Test.SkipUnless(Condition.HasCurlFeature('http2'), Condition.HasProxyVerifierVersion('2.8.0'))
-Test.SkipIf(Condition.CurlUds())
 Test.ContinueOnFail = True
 
 
@@ -55,7 +54,8 @@ def __setupTS(self, ts_names=['default']):
 
             self.ts[name].Disk.records_config.update(
                 {
-                    "proxy.config.http.server_ports": f"{self.ts[name].Variables.port} {self.ts[name].Variables.ssl_port}:ssl",
+                    "proxy.config.http.server_ports":
+                        f"{self.ts[name].Variables.port} {self.ts[name].Variables.ssl_port}:ssl {self.ts[name].Variables.uds_path}",
                     "proxy.config.http.background_fill_active_timeout": "0",
                     "proxy.config.http.background_fill_completed_threshold": "0.0",
                     "proxy.config.http.cache.required_headers": 0,  # Force cache
@@ -113,7 +113,8 @@ def __testCase0(self):
 timeout 2 {{curl}} --http1.1 -vs http://127.0.0.1:{self.ts['for_httpbin'].Variables.port}/drip?duration=4;
 sleep 4;
 {{curl}} --http1.1 -vs http://127.0.0.1:{self.ts['for_httpbin'].Variables.port}/drip?duration=4
-""")
+""",
+            uds_path=self.ts['for_httpbin'].Variables.uds_path)
         tr.Processes.Default.ReturnCode = 0
         tr.Processes.Default.Streams.stderr = Testers.Any(
             "gold/background_fill_0_stderr_H.gold", "gold/background_fill_0_stderr_W.gold")
@@ -131,7 +132,8 @@ def __testCase1(self):
 timeout 3 {{curl}} --http1.1 -vsk https://127.0.0.1:{self.ts['for_httpbin'].Variables.ssl_port}/drip?duration=4;
 sleep 5;
 {{curl}} --http1.1 -vsk https://127.0.0.1:{self.ts['for_httpbin'].Variables.ssl_port}/drip?duration=4
-""")
+""",
+            uds_path=self.ts['for_httpbin'].Variables.uds_path)
         tr.Processes.Default.ReturnCode = 0
         tr.Processes.Default.Streams.stderr = Testers.Any(
             "gold/background_fill_1_stderr_H.gold", "gold/background_fill_1_stderr_W.gold")
@@ -149,7 +151,8 @@ def __testCase2(self):
 timeout 3 {{curl}} --http2 -vsk https://127.0.0.1:{self.ts['for_httpbin'].Variables.ssl_port}/drip?duration=4;
 sleep 5;
 {{curl}} --http2 -vsk https://127.0.0.1:{self.ts['for_httpbin'].Variables.ssl_port}/drip?duration=4
-""")
+""",
+            uds_path=self.ts['for_httpbin'].Variables.uds_path)
         tr.Processes.Default.ReturnCode = 0
         tr.Processes.Default.Streams.stderr = Testers.Any(
             "gold/background_fill_2_stderr_H.gold", "gold/background_fill_2_stderr_W.gold")
@@ -173,9 +176,10 @@ def __testCase3(self):
 
     def run(self):
         self.__testCase0()
-        self.__testCase1()
-        self.__testCase2()
-        self.__testCase3()
+        if not Condition.CurlUsingUnixDomainSocket():
+            self.__testCase1()
+            self.__testCase2()
+            self.__testCase3()
 
 
 BackgroundFillTest().run()