Update curl command from uds_path to ts arg

Author: Serris Lew

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), uds_path=ts.Variables.uds_path)
+tr.MakeCurlCommand('"http://127.0.0.1:{0}" --verbose'.format(ts.Variables.port), ts=ts)
 
 ```
 

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

@@ -30,11 +30,11 @@ Tools to help with TestRun commands
 #
 
 
-def spawn_curl_commands(self, cmdstr, count, retcode=0, use_default=True, uds_path=""):
+def spawn_curl_commands(self, cmdstr, count, retcode=0, use_default=True, ts):
     ret = []
 
     if self.Variables.get("CurlUds", False):
-        cmdstr = f'curl --unix-socket {uds_path} ' + cmdstr
+        cmdstr = f'curl --unix-socket {ts.Variables.uds_path} ' + cmdstr
     else:
         cmdstr = 'curl ' + cmdstr
     if use_default:
@@ -48,20 +48,20 @@ def spawn_curl_commands(self, cmdstr, count, retcode=0, use_default=True, uds_pa
     return ret
 
 
-def curl_command(self, cmd, uds_path="", p=None):
+def curl_command(self, cmd, ts, p=None):
     if p == None:
         p = self.Processes.Default
     if self.Variables.get("CurlUds", False):
-        p.Command = f'curl --unix-socket {uds_path} ' + cmd
+        p.Command = f'curl --unix-socket {ts.Variables.uds_path} ' + cmd
     else:
         p.Command = 'curl ' + cmd
     return p
 
 
-def curl_multiple_commands(self, cmd, uds_path=""):
+def curl_multiple_commands(self, cmd, ts):
     p = self.Processes.Default
     if self.Variables.get("CurlUds", False):
-        p.Command = cmd.format(curl=f'curl --unix-socket {uds_path}', curl_base='curl')
+        p.Command = cmd.format(curl=f'curl --unix-socket {ts.Variables.uds_path}', curl_base='curl')
     else:
         p.Command = cmd.format(curl='curl', curl_base='curl')
     return p

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), uds_path=ts.Variables.uds_path)
+t.MakeCurlCommand("http://127.0.0.1:{0}".format(ts.Variables.port), ts=ts)
 p.ReturnCode = 0
 p.StartBefore(Test.Processes.ts)

tests/gold_tests/basic/config.test.py

@@ -15,7 +15,6 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-import os
 
 Test.Summary = "Test start up of Traffic server with configuration modification of starting port"
 
@@ -27,6 +26,6 @@
 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), uds_path=ts.Variables.uds_path)
+t.MakeCurlCommand("127.0.0.1:{port}".format(port=ts.Variables.port), ts=ts)
 t.ReturnCode = 0
 t.StillRunningAfter = ts

tests/gold_tests/basic/copy_config.test.py

@@ -15,7 +15,6 @@
 #  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
-import os
 
 Test.Summary = "Test start up of Traffic server with configuration modification of starting port of different servers at the same time"
 
@@ -38,7 +37,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), uds_path=ts1.Variables.uds_path)
+t.MakeCurlCommand("127.0.0.1:{port}".format(port=ts1.Variables.port), ts=ts1)
 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), uds_path=ts1.Variables.uds_path)
+t.MakeCurlCommand("127.0.0.1:{0}".format(ts1.Variables.port), ts=ts1)
 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), uds_path=ts2.Variables.uds_path)
+t.MakeCurlCommand("127.0.0.1:{0}".format(ts2.Variables.port), ts=ts2)
 p.ReturnCode = 0

tests/gold_tests/bigobj/bigobj.test.py

@@ -75,12 +75,12 @@ def create_pushfile():
     "-v -H 'Content-Type: application/octet-stream' --data-binary @{}/objfile -X PUSH http://localhost:{}/bigobj -H 'Content-Length:{}'"
     .format(Test.RunDirectory, ts.Variables.port,
             len(header) + obj_bytes),
-    uds_path=ts.Variables.uds_path)
+    ts=ts)
 tr.Processes.Default.ReturnCode = 0
 tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/1.1 201 Created", "The PUSH request should have succeeded")
 
 tr = Test.AddTestRun("GET bigobj: cleartext, HTTP/1.1, IPv4")
-tr.MakeCurlCommand(f'--verbose {ipv4flag} --http1.1 http://localhost:{ts.Variables.port}/bigobj', uds_path=ts.Variables.uds_path)
+tr.MakeCurlCommand(f'--verbose {ipv4flag} --http1.1 http://localhost:{ts.Variables.port}/bigobj', ts=ts)
 tr.Processes.Default.ReturnCode = 0
 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")
@@ -131,7 +131,7 @@ def create_pushfile():
     "-v -H 'Content-Type: application/octet-stream' --data-binary @{}/objfile -X PUSH http://localhost:{}/bigobj -H 'Content-Length:{}'"
     .format(Test.RunDirectory, ts.Variables.port,
             len(header) + obj_bytes),
-    uds_path=ts.Variables.uds_path)
+    ts=ts)
 tr.Processes.Default.ReturnCode = 0
 tr.Processes.Default.Streams.All = Testers.ContainsExpression(
     "403 Access Denied", "The PUSH request should have received a 403 response.")

tests/gold_tests/cache/background_fill.test.py

@@ -114,7 +114,7 @@ def __testCase0(self):
 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)
+            ts=self.ts['for_httpbin'])
         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")
@@ -133,7 +133,7 @@ def __testCase1(self):
 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)
+            ts=self.ts['for_httpbin'])
         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")
@@ -152,7 +152,7 @@ def __testCase2(self):
 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)
+            ts=self.ts['for_httpbin'])
         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")

tests/gold_tests/cache/cache-control.test.py

@@ -82,7 +82,7 @@
 tr.MakeCurlCommand(
     '-s -D - -v {ipv4} --http1.1 -H "x-debug: x-cache,via" -H "Host: www.example.com" http://localhost:{port}/max_age_10sec'.format(
         port=ts.Variables.port, ipv4=ipv4flag),
-    uds_path=ts.Variables.uds_path)
+    ts=ts)
 tr.Processes.Default.ReturnCode = 0
 tr.Processes.Default.Streams.stdout = "gold/cache_and_req_body-miss.gold"
 tr.StillRunningAfter = ts

tests/gold_tests/cache/cache-generation-clear.test.py

@@ -51,7 +51,7 @@
 tr.MakeCurlCommand(
     '"http://127.0.0.1:{0}/default/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose'.format(
         ts.Variables.port, objectid),
-    uds_path=ts.Variables.uds_path)
+    ts=ts)
 tr.Processes.Default.ReturnCode = 0
 tr.Processes.Default.StartBefore(Test.Processes.ts)
 tr.Processes.Default.Streams.All = "gold/miss_default-1.gold"
@@ -61,7 +61,7 @@
 tr.MakeCurlCommand(
     '"http://127.0.0.1:{0}/default/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose'.format(
         ts.Variables.port, objectid),
-    uds_path=ts.Variables.uds_path)
+    ts=ts)
 tr.Processes.Default.ReturnCode = 0
 tr.Processes.Default.Streams.All = "gold/hit_default-1.gold"
 
@@ -79,7 +79,7 @@
 tr.MakeCurlCommand(
     '"http://127.0.0.1:{0}/default/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose'.format(
         ts.Variables.port, objectid),
-    uds_path=ts.Variables.uds_path)
+    ts=ts)
 tr.Processes.Default.ReturnCode = 0
 tr.Processes.Default.Streams.All = "gold/miss_default77.gold"
 
@@ -88,7 +88,7 @@
 tr.MakeCurlCommand(
     '"http://127.0.0.1:{0}/default/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose'.format(
         ts.Variables.port, objectid),
-    uds_path=ts.Variables.uds_path)
+    ts=ts)
 tr.Processes.Default.ReturnCode = 0
 tr.Processes.Default.Streams.All = "gold/hit_default77.gold"
 
@@ -97,6 +97,6 @@
 tr.MakeCurlCommand(
     '"http://127.0.0.1:{0}/default/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose'.format(
         ts.Variables.port, objectid),
-    uds_path=ts.Variables.uds_path)
+    ts=ts)
 tr.Processes.Default.ReturnCode = 0
 tr.Processes.Default.Streams.All = "gold/hit_default77.gold"