Run autests with curl UDS default (#12168)

* Run autests with curl UDS default

* Conditionalize bigobj & copy_config autests

* set uds_path in ts runtime dir, not test runtime dir

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

* syntax error

* Update curl command from uds_path to ts arg

---------

Co-authored-by: Serris Lew <lserris@apple.com>

Author: serrislew

CMakePresets.json

@@ -63,6 +63,18 @@
         "ENABLE_EXAMPLE": "ON"
       }
     },
+    {
+      "name": "autest-uds",
+      "inherits": ["default"],
+      "binaryDir": "${sourceDir}/build-autest",
+      "cacheVariables": {
+        "ENABLE_AUTEST": "ON",
+        "ENABLE_AUTEST_UDS": "ON",
+        "CMAKE_INSTALL_PREFIX": "/tmp/ts-autest",
+        "BUILD_EXPERIMENTAL_PLUGINS": "ON",
+        "ENABLE_EXAMPLE": "ON"
+      }
+    },
     {
       "name": "dev",
       "displayName": "development",

tests/CMakeLists.txt

@@ -36,34 +36,53 @@ function(ADD_AUTEST_PLUGIN _NAME)
 endfunction()
 
 add_subdirectory(tools/plugins)
-add_subdirectory(gold_tests/chunked_encoding)
-add_subdirectory(gold_tests/continuations/plugins)
-add_subdirectory(gold_tests/jsonrpc/plugins)
-add_subdirectory(gold_tests/pluginTest/polite_hook_wait)
-add_subdirectory(gold_tests/pluginTest/tsapi)
-add_subdirectory(gold_tests/pluginTest/TSVConnFd)
-add_subdirectory(gold_tests/timeout)
-add_subdirectory(gold_tests/tls)
-
 set(RUNPIPENV PIPENV_VENV_IN_PROJECT=True ${PipEnv})
 
-configure_file(Pipfile Pipfile COPYONLY)
-configure_file(autest.sh.in autest.sh)
-
+set(CMAKE_GOLD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/gold_tests_filtered")
 set(CURL_UDS_FLAG "")
 if(ENABLE_AUTEST_UDS)
   set(CURL_UDS_FLAG "--curl-uds")
+  # Copy everything except dirs: h2, tls
+  # Other specific tests will be skipped
+  file(
+    COPY ${CMAKE_CURRENT_SOURCE_DIR}/gold_tests/
+    DESTINATION ${CMAKE_GOLD_DIR}
+    FILES_MATCHING
+    PATTERN "*"
+    PATTERN "h2" EXCLUDE
+    PATTERN "tls*" EXCLUDE
+    PATTERN "tls/ssl/**"
+  )
+else()
+  # Copy everything except autest_uds tests that are only for curl uds option
+  file(
+    COPY ${CMAKE_CURRENT_SOURCE_DIR}/gold_tests/
+    DESTINATION ${CMAKE_GOLD_DIR}
+    FILES_MATCHING
+    PATTERN "*"
+  )
+  add_subdirectory(gold_tests_filtered/tls)
 endif()
 
+add_subdirectory(gold_tests_filtered/chunked_encoding)
+add_subdirectory(gold_tests_filtered/continuations/plugins)
+add_subdirectory(gold_tests_filtered/jsonrpc/plugins)
+add_subdirectory(gold_tests_filtered/pluginTest/polite_hook_wait)
+add_subdirectory(gold_tests_filtered/pluginTest/tsapi)
+add_subdirectory(gold_tests_filtered/pluginTest/TSVConnFd)
+add_subdirectory(gold_tests_filtered/timeout)
+
+configure_file(Pipfile Pipfile COPYONLY)
+configure_file(autest.sh.in autest.sh)
+
 add_custom_target(
   autest
   COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install
   COMMAND ${RUNPIPENV} install
   COMMAND
-    ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/gold_tests/remap:$ENV{PYTHONPATH} ${RUNPIPENV} run
-    env autest --directory ${CMAKE_CURRENT_SOURCE_DIR}/gold_tests --ats-bin=${CMAKE_INSTALL_PREFIX}/bin
-    --proxy-verifier-bin ${PROXY_VERIFIER_PATH} --build-root ${CMAKE_BINARY_DIR} --sandbox ${AUTEST_SANDBOX}
-    ${CURL_UDS_FLAG} ${AUTEST_OPTIONS}
+    ${CMAKE_COMMAND} -E env PYTHONPATH=${CMAKE_GOLD_DIR}/remap:$ENV{PYTHONPATH} ${RUNPIPENV} run env autest --directory
+    ${CMAKE_GOLD_DIR} --ats-bin=${CMAKE_INSTALL_PREFIX}/bin --proxy-verifier-bin ${PROXY_VERIFIER_PATH} --build-root
+    ${CMAKE_BINARY_DIR} --sandbox ${AUTEST_SANDBOX} ${CURL_UDS_FLAG} ${AUTEST_OPTIONS}
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   USES_TERMINAL
 )

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), ts=ts)
 
 ```
 

tests/autest.sh.in

@@ -9,7 +9,7 @@ export PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/gold_tests/remap:$PYTHONPATH
 
 ${RUNPIPENV} run env autest \
   --sandbox ${AUTEST_SANDBOX} \
-  --directory ${CMAKE_CURRENT_SOURCE_DIR}/gold_tests \
+  --directory ${CMAKE_GOLD_DIR} \
   --ats-bin=${CMAKE_INSTALL_PREFIX}/bin \
   --proxy-verifier-bin ${PROXY_VERIFIER_PATH} \
   --build-root ${CMAKE_BINARY_DIR} \

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

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

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):
+def spawn_curl_commands(self, cmdstr, count, retcode=0, use_default=True, ts):
     ret = []
 
     if self.Variables.get("CurlUds", False):
-        cmdstr = 'curl --unix-socket /tmp/socket ' + cmdstr
+        cmdstr = f'curl --unix-socket {ts.Variables.uds_path} ' + cmdstr
     else:
         cmdstr = 'curl ' + cmdstr
     if use_default:
@@ -48,24 +48,22 @@ def spawn_curl_commands(self, cmdstr, count, retcode=0, use_default=True):
     return ret
 
 
-def curl_command(self, cmd, p=None):
+def curl_command(self, cmd, ts, p=None):
     if p == None:
         p = self.Processes.Default
     if self.Variables.get("CurlUds", False):
-        uds_path = os.path.join(p.RunDirectory, 'uds.socket')
-        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):
+def curl_multiple_commands(self, cmd, ts):
     p = self.Processes.Default
     if self.Variables.get("CurlUds", False):
-        uds_path = os.path.join(p.RunDirectory, 'uds.socket')
-        p.Command = cmd.format(curl=f'curl --unix-socket {uds_path}')
+        p.Command = cmd.format(curl=f'curl --unix-socket {ts.Variables.uds_path}', curl_base='curl')
     else:
-        p.Command = cmd.format(curl='curl')
+        p.Command = cmd.format(curl='curl', curl_base='curl')
     return p
 
 

tests/gold_tests/autest-site/setup.cli.ext

@@ -116,7 +116,7 @@ Variables.VerifierBinPath = ENV['VERIFIER_BIN']
 Variables.BuildRoot = ENV['BUILD_ROOT']
 Variables.RepoDir = repo_root
 Variables.AtsTestPluginsDir = os.path.join(Variables.BuildRoot, 'tests', 'tools', 'plugins', '.libs')
-Variables.AtsBuildGoldTestsDir = os.path.join(Variables.BuildRoot, 'tests', 'gold_tests')
+Variables.AtsBuildGoldTestsDir = os.path.join(Variables.BuildRoot, 'tests', 'gold_tests_filtered')
 Variables.CurlUds = Arguments.curl_uds
 
 # modify delay times as we always have to kill Trafficserver

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

@@ -368,7 +368,7 @@ def MakeATSProcess(
             p.Variables.ssl_portv6 = 4444
 
     # unix domain socket path
-    uds_path = os.path.join(obj.RunDirectory, 'uds.socket')
+    uds_path = os.path.join(runtime_dir, 'uds.socket')
     p.Variables.uds_path = uds_path
 
     get_port(p, "manager_port")

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), ts=ts)
 p.ReturnCode = 0
 p.StartBefore(Test.Processes.ts)

tests/gold_tests/basic/config.test.py

@@ -21,11 +21,11 @@
 ts = Test.MakeATSProcess("ts", select_ports=False)
 ts.Variables.port = 8090
 ts.Disk.records_config.update({
-    'proxy.config.http.server_ports': str(ts.Variables.port),
+    '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), ts=ts)
 t.ReturnCode = 0
 t.StillRunningAfter = ts