Run autests with curl UDS default

Author: Serris Lew

CMakePresets.json

@@ -61,6 +61,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
+  )
+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 "*"
+    PATTERN "*_uds.test.py" EXCLUDE
+  )
+  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/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 CurlUds(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(CurlUds)

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

@@ -34,7 +34,8 @@ def spawn_curl_commands(self, cmdstr, count, retcode=0, use_default=True):
     ret = []
 
     if self.Variables.get("CurlUds", False):
-        cmdstr = 'curl --unix-socket /tmp/socket ' + cmdstr
+        uds_path = os.path.join(self.Processes.Default.RunDirectory, 'uds.socket')
+        cmdstr = f'curl --unix-socket {uds_path} ' + cmdstr
     else:
         cmdstr = 'curl ' + cmdstr
     if use_default:
@@ -48,11 +49,12 @@ 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, uds_suffix="", p=None):
     if p == None:
         p = self.Processes.Default
     if self.Variables.get("CurlUds", False):
         uds_path = os.path.join(p.RunDirectory, 'uds.socket')
+        uds_path += uds_suffix
         p.Command = f'curl --unix-socket {uds_path} ' + cmd
     else:
         p.Command = 'curl ' + cmd
@@ -63,9 +65,9 @@ def curl_multiple_commands(self, cmd):
     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 {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

@@ -53,6 +53,7 @@ def MakeATSProcess(
         enable_cache=True,
         enable_quic=False,
         enable_uds=True,
+        uds_path_suffix='',
         block_for_debug=False,
         log_data=default_log_data,
         use_traffic_out=True,
@@ -369,6 +370,7 @@ def MakeATSProcess(
 
     # unix domain socket path
     uds_path = os.path.join(obj.RunDirectory, 'uds.socket')
+    uds_path += uds_path_suffix  # to allow multiple sockets in one test file
     p.Variables.uds_path = uds_path
 
     get_port(p, "manager_port")

tests/gold_tests/basic/config.test.py

@@ -15,13 +15,15 @@
 #  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"
 
 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),
+    'proxy.config.http.server_ports': str(ts.Variables.port) + f" {uds_path}",
 })
 ts.Ready = When.PortOpen(ts.Variables.port)
 t = Test.AddTestRun("Test traffic server started properly")

tests/gold_tests/basic/copy_config.test.py

@@ -17,6 +17,7 @@
 #  limitations under the License.
 
 Test.Summary = "Test start up of Traffic server with configuration modification of starting port of different servers at the same time"
+Test.SkipIf(Condition.CurlUds())
 
 # set up some ATS processes
 ts1 = Test.MakeATSProcess("ts1", select_ports=False)

tests/gold_tests/basic/copy_config_uds.test.py

@@ -0,0 +1,45 @@
+'''
+'''
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  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"
+
+# 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}",
+})
+ts1.Ready = When.PortOpen(ts1.Variables.port)
+
+ts2 = Test.MakeATSProcess("ts2", select_ports=False)
+ts2.Variables.port = 8091
+ts2.Disk.records_config.update({
+    'proxy.config.http.server_ports': str(ts2.Variables.port),
+})
+ts2.Ready = When.PortOpen(ts2.Variables.port)
+
+# setup a testrun
+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.ReturnCode = 0
+t.StillRunningAfter = ts1
+t.StillRunningAfter += ts2