You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by cm...@apache.org on 2025/08/14 14:06:11 UTC
(trafficserver) branch 10.1.x updated: [10.1.x] Run autests with curl UDS default (#12360)
This is an automated email from the ASF dual-hosted git repository.
cmcfarlen pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 2431555d56 [10.1.x] Run autests with curl UDS default (#12360)
2431555d56 is described below
commit 2431555d56cffe6e429782e02f9d61aaab8ed72f
Author: Serris Lew <se...@gmail.com>
AuthorDate: Thu Aug 14 07:06:05 2025 -0700
[10.1.x] Run autests with curl UDS default (#12360)
* [10.1.x] Run autests with curl UDS default
* Fix autest syntax and remove test file copy (#12350)
* Fix autest syntax and ignore filtered test dir
* add ts to all curlcommand and replace gold_tests_filtered to run in build tree
* Update repo dir from build root
* rm extra copy of test files
* remove var dir
* rm temp skipped gold dir
---------
Co-authored-by: Serris Lew <ls...@apple.com>
* rebase 10.1.x
---------
Co-authored-by: Serris Lew <ls...@apple.com>
---
CMakePresets.json | 12 +++
tests/CMakeLists.txt | 39 +++++---
tests/README.md | 2 +-
tests/autest.sh.in | 26 ++++-
tests/gold_tests/autest-site/conditions.test.ext | 5 +
tests/gold_tests/autest-site/curl.test.ext | 16 ++--
.../gold_tests/autest-site/trafficserver.test.ext | 2 +-
tests/gold_tests/basic/basic.test.py | 2 +-
tests/gold_tests/basic/config.test.py | 4 +-
tests/gold_tests/basic/copy_config.test.py | 8 +-
tests/gold_tests/basic/copy_config2.test.py | 4 +-
tests/gold_tests/bigobj/bigobj.test.py | 47 +++++----
tests/gold_tests/cache/background_fill.test.py | 19 ++--
tests/gold_tests/cache/cache-control.test.py | 9 +-
.../cache/cache-generation-clear.test.py | 15 ++-
.../cache/cache-generation-disjoint.test.py | 18 ++--
.../cache/disjoint-wait-for-cache.test.py | 18 ++--
.../chunked_encoding/bad_chunked_encoding.test.py | 6 +-
.../chunked_encoding/chunked_encoding.test.py | 33 ++++---
.../chunked_encoding/chunked_encoding_h2.test.py | 7 +-
.../chunked_encoding/gold/chunked_GET_200.gold | 2 +-
...unked_GET_200.gold => chunked_GET_200_uds.gold} | 4 +-
tests/gold_tests/connect/connect.test.py | 16 ++--
.../connect/gold/connect_0_stderr_uds.gold | 19 ++++
tests/gold_tests/continuations/double.test.py | 2 +-
tests/gold_tests/continuations/double_h2.test.py | 3 +-
tests/gold_tests/continuations/openclose.test.py | 2 +-
.../gold_tests/continuations/openclose_h2.test.py | 3 +-
tests/gold_tests/continuations/session_id.test.py | 18 ++--
tests/gold_tests/cripts/cripts.test.py | 2 +-
tests/gold_tests/dns/splitdns.test.py | 4 +-
tests/gold_tests/early_hints/early_hints.test.py | 8 +-
.../gold_tests/forward_proxy/forward_proxy.test.py | 4 +-
tests/gold_tests/h2/h2disable.test.py | 6 +-
.../h2/h2disable_no_accept_threads.test.py | 6 +-
tests/gold_tests/h2/h2enable.test.py | 7 +-
.../h2/h2enable_no_accept_threads.test.py | 6 +-
tests/gold_tests/h2/http2.test.py | 10 +-
tests/gold_tests/h2/http2_priority.test.py | 2 +-
tests/gold_tests/h2/httpbin.test.py | 10 +-
tests/gold_tests/headers/accept_webp.test.py | 10 +-
.../gold_tests/headers/cache_and_req_body.test.py | 8 +-
tests/gold_tests/headers/cachedIMSRange.test.py | 81 +++++++++-------
tests/gold_tests/headers/field_name_space.test.py | 7 +-
tests/gold_tests/headers/forwarded.test.py | 25 +++--
.../headers/general-connection-failure-502.gold | 2 +-
.../headers/good_request_after_bad.test.py | 5 +-
tests/gold_tests/headers/hsts.test.py | 8 +-
tests/gold_tests/headers/normalize_ae.test.py | 18 ++--
tests/gold_tests/headers/range.test.py | 22 ++---
tests/gold_tests/headers/syntax.test.py | 28 ++++--
tests/gold_tests/headers/via.test.py | 73 ++++++++------
tests/gold_tests/headers/via_uds.gold | 3 +
tests/gold_tests/ip_allow/ip_allow.test.py | 10 +-
.../{ip_allow.test.py => ip_allow_pp_uds.test.py} | 99 +------------------
tests/gold_tests/logging/all_headers.test.py | 39 ++++++--
...ustom-log.test.py => custom-log-pp-uds.test.py} | 33 ++++---
tests/gold_tests/logging/custom-log.test.py | 17 ++--
tests/gold_tests/logging/gold/custom_uds.gold | 8 ++
.../logging/gold/test_all_headers_uds.gold | 58 +++++++++++
tests/gold_tests/logging/log-field-json.test.py | 8 +-
tests/gold_tests/logging/log-field.test.py | 6 +-
tests/gold_tests/logging/log-filenames.test.py | 3 +-
tests/gold_tests/logging/log_retention.test.py | 18 ++--
tests/gold_tests/logging/new_log_flds.test.py | 29 +++---
tests/gold_tests/logging/new_log_flds_observer.py | 4 +-
tests/gold_tests/logging/pqsi-pqsp.test.py | 4 +-
.../parent_config/parent_config_dest_ip.test.py | 2 +-
.../next_hop/strategies_ch/strategies_ch.test.py | 2 +-
.../next_hop/strategies_ch2/strategies_ch2.test.py | 4 +-
.../strategies_stale/strategies_stale.test.py | 4 +-
.../zzz_strategies_peer.test.py | 7 +-
.../zzz_strategies_peer2.test.py | 8 +-
.../null_transform/gold/null_transform-200.gold | 2 +-
.../null_transform/null_transform.test.py | 2 +-
.../per_server_connection_max.test.py | 8 +-
tests/gold_tests/parent_proxy/parent-retry.test.py | 2 +-
.../pluginTest/TSVConnFd/TSVConnFd.test.py | 6 +-
.../cache_range_requests.test.py | 26 ++---
...range_requests_cache_complete_responses.test.py | 30 +++---
.../cache_range_requests_cachekey.test.py | 6 +-
.../cache_range_requests_cachekey_global.test.py | 2 +-
.../cache_range_requests_ims.test.py | 8 +-
.../pluginTest/cert_update/cert_update.test.py | 12 ++-
.../client_context_dump.test.py | 2 +-
tests/gold_tests/pluginTest/compress/compress.gold | 44 ++++-----
.../pluginTest/compress/compress.test.py | 28 +++---
.../pluginTest/cookie_remap/bucketcookie.test.py | 6 +-
.../cookie_remap/collapseslashes.test.py | 3 +-
.../pluginTest/cookie_remap/connector.test.py | 6 +-
.../pluginTest/cookie_remap/existscookie.test.py | 6 +-
.../pluginTest/cookie_remap/matchcookie.test.py | 6 +-
.../pluginTest/cookie_remap/matchuri.test.py | 6 +-
.../cookie_remap/notexistscookie.test.py | 6 +-
.../cookie_remap/pcollapseslashes.test.py | 3 +-
.../pluginTest/cookie_remap/psubstitute.test.py | 12 ++-
.../pluginTest/cookie_remap/regexcookie.test.py | 6 +-
.../pluginTest/cookie_remap/setstatus.test.py | 6 +-
.../pluginTest/cookie_remap/subcookie.test.py | 6 +-
.../pluginTest/cookie_remap/substitute.test.py | 12 ++-
tests/gold_tests/pluginTest/esi/esi.test.py | 21 ++--
tests/gold_tests/pluginTest/esi/esi_304.test.py | 6 +-
.../pluginTest/esi/esi_nested_include.test.py | 3 +-
.../header_rewrite/gold/header_rewrite-303.gold | 2 +-
.../header_rewrite/gold/header_rewrite-client.gold | 2 +-
.../gold/header_rewrite-l_value.gold | 2 +-
.../gold/header_rewrite_cond_method.gold | 2 +-
.../header_rewrite/header_rewrite.test.py | 2 +-
.../header_rewrite_cond_cache.test.py | 2 +-
.../header_rewrite_cond_method.test.py | 5 +-
.../header_rewrite_cond_ssn_txn_count.test.py | 2 +-
.../header_rewrite/header_rewrite_l_value.test.py | 2 +-
.../header_rewrite_set_body_from.test.py | 14 ++-
.../header_rewrite/header_rewrite_url.test.py | 5 +-
.../header_rewrite/header_rewrite_url_glob.test.py | 4 +-
.../pluginTest/healthchecks/healthchecks.test.py | 8 +-
.../ja4_fingerprint/ja4_fingerprint.test.py | 2 +-
.../pluginTest/lua/lua_client_hook.test.py | 2 +-
.../pluginTest/lua/lua_debug_tags.test.py | 2 +-
.../pluginTest/lua/lua_header_table.test.py | 2 +-
.../pluginTest/lua/lua_states_stats.test.py | 2 +-
.../pluginTest/lua/lua_watermark.test.py | 2 +-
.../pluginTest/money_trace/money_trace.test.py | 26 ++---
.../money_trace/money_trace_global.test.py | 6 +-
.../origin_server_auth/origin_server_auth.test.py | 4 +-
.../pluginTest/polite_hook_wait/curl.gold | 1 +
.../polite_hook_wait/polite_hook_wait.test.py | 10 +-
.../pluginTest/prefetch/prefetch_bignum.gold | 2 +-
.../pluginTest/prefetch/prefetch_bignum.test.py | 5 +-
.../pluginTest/prefetch/prefetch_cmcd.test.py | 20 ++--
.../pluginTest/prefetch/prefetch_overflow.gold | 2 +-
.../pluginTest/prefetch/prefetch_overflow.test.py | 4 +-
.../pluginTest/prefetch/prefetch_simple.gold | 2 +-
.../pluginTest/prefetch/prefetch_simple.test.py | 4 +-
.../pluginTest/regex_remap/regex_remap.test.py | 10 +-
.../regex_revalidate/regex_revalidate.test.py | 18 ++--
.../regex_revalidate/regex_revalidate_miss.test.py | 18 ++--
.../pluginTest/remap_stats/remap_stats.test.py | 4 +-
.../remap_stats/remap_stats_post.test.py | 4 +-
tests/gold_tests/pluginTest/slice/slice.test.py | 20 ++--
.../pluginTest/slice/slice_conditional.test.py | 12 +--
.../pluginTest/slice/slice_error.test.py | 8 +-
.../pluginTest/slice/slice_prefetch.test.py | 12 +--
.../pluginTest/slice/slice_regex.test.py | 8 +-
.../pluginTest/slice/slice_selfhealing.test.py | 28 +++---
.../pluginTest/sslheaders/sslheaders.test.py | 4 +-
.../stats_over_http/stats_over_http.test.py | 16 ++--
.../pluginTest/test_hooks/body_buffer.test.py | 7 +-
.../pluginTest/test_hooks/hook_add.test.py | 6 +-
.../gold_tests/pluginTest/test_hooks/log_uds.gold | 12 +++
.../test_hooks/ssn_start_delay_hook.test.py | 6 +-
.../pluginTest/test_hooks/test_hooks.test.py | 31 +++---
tests/gold_tests/pluginTest/tsapi/log_uds.gold | 106 +++++++++++++++++++++
tests/gold_tests/pluginTest/tsapi/tsapi.test.py | 25 +++--
.../pluginTest/uri_signing/uri_signing.test.py | 48 +++++-----
.../gold_tests/pluginTest/url_sig/url_sig.test.py | 57 +++++++----
tests/gold_tests/post/post-continue.test.py | 49 ++++++----
tests/gold_tests/post/post-early-return.test.py | 9 +-
.../post_slow_server/post_slow_server.test.py | 3 +-
.../post_slow_server_max_requests_in.test.py | 4 +-
.../proxy_serve_stale_dns_fail.test.py | 10 +-
.../redirect/gold/number_of_redirections_0.gold | 14 +--
.../redirect/gold/number_of_redirections_2.gold | 6 +-
.../redirect/number_of_redirects.test.py | 2 +-
tests/gold_tests/redirect/redirect_post.test.py | 5 +-
.../gold_tests/remap/basic_conf_remap_yaml.test.py | 22 +++--
.../gold/200OK_test_uds.gold} | 9 +-
.../remap/gold/remap-ws-metrics-uds.gold | 21 ++++
tests/gold_tests/remap/regex_map.test.py | 2 +-
tests/gold_tests/remap/remap_http.test.py | 29 +++---
tests/gold_tests/remap/remap_https.test.py | 21 ++--
tests/gold_tests/remap/remap_ip_resolve.test.py | 4 +-
tests/gold_tests/remap/remap_ws.test.py | 33 ++++---
.../session_sharing/session_match.test.py | 3 +-
tests/gold_tests/slow_post/server_abort.test.py | 3 +-
tests/gold_tests/timeout/active_timeout.test.py | 27 +++---
tests/gold_tests/timeout/conn_timeout.test.py | 4 +-
.../timeout/inactive_client_timeout.test.py | 17 ++--
tests/gold_tests/timeout/inactive_timeout.test.py | 22 ++---
tests/gold_tests/timeout/slow_server_uds.yaml | 83 ++++++++++++++++
tests/gold_tests/timeout/tls_conn_timeout.test.py | 9 +-
tests/gold_tests/tls/allow-plain.test.py | 9 +-
tests/gold_tests/tls/ssl_key_dialog.test.py | 8 +-
tests/gold_tests/tls/ssl_multicert_loader.test.py | 4 +-
tests/gold_tests/tls/tls_0rtt_server.test.py | 2 +-
tests/gold_tests/tls/tls_bad_alpn.test.py | 2 +-
.../tls/tls_check_cert_select_plugin.test.py | 18 ++--
.../tls/tls_check_cert_selection.test.py | 12 ++-
.../tls/tls_check_cert_selection_reload.test.py | 8 +-
tests/gold_tests/tls/tls_client_cert.test.py | 24 ++---
tests/gold_tests/tls/tls_client_cert2.test.py | 16 ++--
.../gold_tests/tls/tls_client_cert2_plugin.test.py | 16 ++--
.../tls/tls_client_cert_override.test.py | 8 +-
.../tls/tls_client_cert_override_plugin.test.py | 14 +--
.../gold_tests/tls/tls_client_cert_plugin.test.py | 24 ++---
tests/gold_tests/tls/tls_client_verify.test.py | 39 +++++---
tests/gold_tests/tls/tls_client_verify2.test.py | 31 +++---
tests/gold_tests/tls/tls_client_verify3.test.py | 18 ++--
tests/gold_tests/tls/tls_client_versions.test.py | 12 ++-
.../tls/tls_client_versions_minmax.test.py | 15 ++-
tests/gold_tests/tls/tls_engine.test.py | 2 +-
.../gold_tests/tls/tls_hooks_client_verify.test.py | 9 +-
tests/gold_tests/tls/tls_hooks_verify.test.py | 6 +-
tests/gold_tests/tls/tls_keepalive.test.py | 11 ++-
tests/gold_tests/tls/tls_ocsp.test.py | 3 +-
.../tls/tls_origin_session_reuse.test.py | 9 +-
.../tls/tls_partial_blind_tunnel.test.py | 2 +-
tests/gold_tests/tls/tls_sni_groups.test.py | 9 +-
tests/gold_tests/tls/tls_sni_host_policy.test.py | 25 +++--
tests/gold_tests/tls/tls_sni_yaml_reload.test.py | 8 +-
tests/gold_tests/tls/tls_tunnel.test.py | 23 +++--
tests/gold_tests/tls/tls_tunnel_forward.test.py | 6 +-
tests/gold_tests/tls/tls_verify.test.py | 10 +-
tests/gold_tests/tls/tls_verify2.test.py | 12 +--
tests/gold_tests/tls/tls_verify3.test.py | 11 ++-
tests/gold_tests/tls/tls_verify4.test.py | 6 +-
tests/gold_tests/tls/tls_verify_base.test.py | 8 +-
.../gold_tests/tls/tls_verify_ca_override.test.py | 8 +-
.../gold_tests/tls/tls_verify_not_pristine.test.py | 4 +-
tests/gold_tests/tls/tls_verify_override.test.py | 26 ++---
.../tls/tls_verify_override_base.test.py | 28 +++---
.../gold_tests/tls/tls_verify_override_sni.test.py | 6 +-
tests/gold_tests/tls_hooks/tls_hooks.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks10.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks11.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks12.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks13.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks14.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks15.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks16.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks17.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks18.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks2.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks3.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks4.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks6.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks7.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks8.test.py | 2 +-
tests/gold_tests/tls_hooks/tls_hooks9.test.py | 2 +-
.../traffic_ctl/remap_inc/remap_inc.test.py | 2 +-
tests/gold_tests/tunnel/tunnel_transform.test.py | 3 +-
tests/gold_tests/tunnel/txn_type.test.py | 7 +-
242 files changed, 1819 insertions(+), 1131 deletions(-)
diff --git a/CMakePresets.json b/CMakePresets.json
index 8a68e24b35..83db961a8f 100644
--- a/CMakePresets.json
+++ b/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",
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 7704edf3bc..5e0b06805d 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -47,23 +47,24 @@ 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")
+set(CMAKE_SKIP_GOLD_DIR "${CMAKE_CURRENT_SOURCE_DIR}/_skipped_uds_gold_tests")
set(CURL_UDS_FLAG "")
if(ENABLE_AUTEST_UDS)
set(CURL_UDS_FLAG "--curl-uds")
endif()
+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
)
@@ -72,10 +73,26 @@ add_custom_target(
autest_no_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
+)
+
+# autest uds specific target that skips tests and runs with curl flag
+add_custom_target(
+ autest-uds
+ COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target install
+ COMMAND ${RUNPIPENV} install
+ COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_GOLD_DIR}/h2 ${CMAKE_SKIP_GOLD_DIR}/h2
+ COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_GOLD_DIR}/tls ${CMAKE_SKIP_GOLD_DIR}/tls
+ COMMAND
+ ${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}
+ COMMAND ${CMAKE_COMMAND} -E rename {CMAKE_SKIP_GOLD_DIR}/h2 ${CMAKE_GOLD_DIR}/h2
+ COMMAND ${CMAKE_COMMAND} -E rename ${CMAKE_SKIP_GOLD_DIR}/tls ${CMAKE_GOLD_DIR}/tls
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
USES_TERMINAL
)
diff --git a/tests/README.md b/tests/README.md
index a1dea3cf1c..5b98a8786c 100644
--- a/tests/README.md
+++ b/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)
```
diff --git a/tests/autest.sh.in b/tests/autest.sh.in
index bd6c433ff2..7042c3bdea 100755
--- a/tests/autest.sh.in
+++ b/tests/autest.sh.in
@@ -7,11 +7,35 @@
export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib
export PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}/gold_tests/remap:$PYTHONPATH
+# Define tests to skip for CURL_UDS_FLAG
+if [ -n "${CURL_UDS_FLAG}" ]; then
+ mkdir -p "${CMAKE_SKIP_GOLD_DIR}"
+ if [ -d "${CMAKE_GOLD_DIR}/h2" ]; then
+ mv "${CMAKE_GOLD_DIR}/h2" "${CMAKE_SKIP_GOLD_DIR}/h2"
+ fi
+ if [ -d "${CMAKE_GOLD_DIR}/tls" ]; then
+ mv "${CMAKE_GOLD_DIR}/tls" "${CMAKE_SKIP_GOLD_DIR}/tls"
+ fi
+fi
+
${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} \
${CURL_UDS_FLAG} ${AUTEST_OPTIONS} \
"$@"
+
+# Restore tests back to source tree and remove temp dir
+if [ -n "${CURL_UDS_FLAG}" ]; then
+ if [ -d "${CMAKE_SKIP_GOLD_DIR}/h2" ]; then
+ mv "${CMAKE_SKIP_GOLD_DIR}/h2" "${CMAKE_GOLD_DIR}/h2"
+ fi
+ if [ -d "${CMAKE_SKIP_GOLD_DIR}/tls" ]; then
+ mv "${CMAKE_SKIP_GOLD_DIR}/tls" "${CMAKE_GOLD_DIR}/tls"
+ fi
+ if [ -d "${CMAKE_SKIP_GOLD_DIR}" ]; then
+ rm -rf "${CMAKE_SKIP_GOLD_DIR}"
+ fi
+fi
diff --git a/tests/gold_tests/autest-site/conditions.test.ext b/tests/gold_tests/autest-site/conditions.test.ext
index 37db31338b..ed2656a32c 100644
--- a/tests/gold_tests/autest-site/conditions.test.ext
+++ b/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)
diff --git a/tests/gold_tests/autest-site/curl.test.ext b/tests/gold_tests/autest-site/curl.test.ext
index f99dc833c1..9fdc31d38b 100644
--- a/tests/gold_tests/autest-site/curl.test.ext
+++ b/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, ts, retcode=0, use_default=True):
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
diff --git a/tests/gold_tests/autest-site/trafficserver.test.ext b/tests/gold_tests/autest-site/trafficserver.test.ext
index a9a2a3f212..59a4849b08 100755
--- a/tests/gold_tests/autest-site/trafficserver.test.ext
+++ b/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")
diff --git a/tests/gold_tests/basic/basic.test.py b/tests/gold_tests/basic/basic.test.py
index 1b8e7db599..d812a38a36 100644
--- a/tests/gold_tests/basic/basic.test.py
+++ b/tests/gold_tests/basic/basic.test.py
@@ -25,6 +25,6 @@ t = Test.AddTestRun("Test traffic server started properly")
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)
diff --git a/tests/gold_tests/basic/config.test.py b/tests/gold_tests/basic/config.test.py
index 24efd11adc..1cb2bf8bc7 100644
--- a/tests/gold_tests/basic/config.test.py
+++ b/tests/gold_tests/basic/config.test.py
@@ -21,11 +21,11 @@ Test.Summary = "Test start up of Traffic server with configuration modification
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
diff --git a/tests/gold_tests/basic/copy_config.test.py b/tests/gold_tests/basic/copy_config.test.py
index 57bd32496a..ea08732be0 100644
--- a/tests/gold_tests/basic/copy_config.test.py
+++ b/tests/gold_tests/basic/copy_config.test.py
@@ -22,11 +22,11 @@ Test.Summary = "Test start up of Traffic server with configuration modification
ts1 = Test.MakeATSProcess("ts1", select_ports=False)
ts1.Variables.port = 8090
ts1.Disk.records_config.update({
- 'proxy.config.http.server_ports': str(ts1.Variables.port),
+ 'proxy.config.http.server_ports': str(ts1.Variables.port) + f" {ts1.Variables.uds_path}",
})
ts1.Ready = When.PortOpen(ts1.Variables.port)
-ts2 = Test.MakeATSProcess("ts2", select_ports=False)
+ts2 = Test.MakeATSProcess("ts2", select_ports=False, enable_uds=False)
ts2.Variables.port = 8091
ts2.Disk.records_config.update({
'proxy.config.http.server_ports': str(ts2.Variables.port),
@@ -37,14 +37,14 @@ ts2.Ready = When.PortOpen(ts2.Variables.port)
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), ts=ts1)
t.ReturnCode = 0
t.StillRunningAfter = ts1
t.StillRunningAfter += ts2
# setup a testrun
t = Test.AddTestRun("Talk to ts2")
-t.MakeCurlCommand("127.0.0.1:{port}".format(port=ts2.Variables.port))
+t.MakeCurlCommandMulti("{{curl_base}} 127.0.0.1:{port}".format(port=ts2.Variables.port), ts=ts2)
t.ReturnCode = 0
t.StillRunningAfter = ts1
t.StillRunningAfter += ts2
diff --git a/tests/gold_tests/basic/copy_config2.test.py b/tests/gold_tests/basic/copy_config2.test.py
index 8a6332f4af..68ecdbba68 100644
--- a/tests/gold_tests/basic/copy_config2.test.py
+++ b/tests/gold_tests/basic/copy_config2.test.py
@@ -27,7 +27,7 @@ t = Test.AddTestRun("Talk to ts1")
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), ts=ts1)
p.ReturnCode = 0
p.StartBefore(Test.Processes.ts1)
p.StartBefore(Test.Processes.ts2)
@@ -39,5 +39,5 @@ t.StillRunningBefore += ts2
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), ts=ts2)
p.ReturnCode = 0
diff --git a/tests/gold_tests/bigobj/bigobj.test.py b/tests/gold_tests/bigobj/bigobj.test.py
index 9f3235f5c6..55bb5c7403 100644
--- a/tests/gold_tests/bigobj/bigobj.test.py
+++ b/tests/gold_tests/bigobj/bigobj.test.py
@@ -63,6 +63,10 @@ def create_pushfile():
return True
+ipv4flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
+
tr = Test.AddTestRun("PUSH an object to the cache")
# Delay on readiness of TS IPv4 ssl port
tr.Processes.Default.StartBefore(ts, ready=lambda: create_pushfile())
@@ -70,33 +74,35 @@ tr.Processes.Default.StartBefore(ts, ready=lambda: create_pushfile())
tr.MakeCurlCommand(
"-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))
+ len(header) + obj_bytes),
+ 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 --ipv4 --http1.1 http://localhost:{ts.Variables.port}/bigobj')
-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")
-
-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.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")
-tr = Test.AddTestRun("GET bigobj: TLS, HTTP/2, IPv4")
-tr.MakeCurlCommand(f'--verbose --ipv4 --http2 --insecure https://localhost:{ts.Variables.ssl_port}/bigobj')
-tr.Processes.Default.ReturnCode = 0
-tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 200", "Should fetch pushed object")
-tr.Processes.Default.Streams.All = Testers.ContainsExpression("content-length: 102400", "Content size should be accurate")
-
-tr = Test.AddTestRun("GET bigobj: TLS, HTTP/2, IPv6")
-tr.MakeCurlCommand(f'--verbose --ipv6 --http2 --insecure https://localhost:{ts.Variables.ssl_portv6}/bigobj')
-tr.Processes.Default.ReturnCode = 0
-tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 200", "Should fetch pushed object")
-tr.Processes.Default.Streams.All = Testers.ContainsExpression("content-length: 102400", "Content size should be accurate")
+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', 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")
+
+ tr = Test.AddTestRun("GET bigobj: TLS, HTTP/2, IPv4")
+ tr.MakeCurlCommand(f'--verbose --ipv4 --http2 --insecure https://localhost:{ts.Variables.ssl_port}/bigobj', ts=ts)
+ tr.Processes.Default.ReturnCode = 0
+ tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 200", "Should fetch pushed object")
+ tr.Processes.Default.Streams.All = Testers.ContainsExpression("content-length: 102400", "Content size should be accurate")
+
+ tr = Test.AddTestRun("GET bigobj: TLS, HTTP/2, IPv6")
+ tr.MakeCurlCommand(f'--verbose --ipv6 --http2 --insecure https://localhost:{ts.Variables.ssl_portv6}/bigobj', ts=ts)
+ tr.Processes.Default.ReturnCode = 0
+ tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 200", "Should fetch pushed object")
+ tr.Processes.Default.Streams.All = Testers.ContainsExpression("content-length: 102400", "Content size should be accurate")
# Verify that PUSH requests are rejected when push_method_enabled is 0 (the
# default configuration).
@@ -124,7 +130,8 @@ tr.Processes.Default.StartBefore(ts)
tr.MakeCurlCommand(
"-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))
+ len(header) + obj_bytes),
+ 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.")
diff --git a/tests/gold_tests/cache/background_fill.test.py b/tests/gold_tests/cache/background_fill.test.py
index 8546b0b547..4c4fe2467d 100644
--- a/tests/gold_tests/cache/background_fill.test.py
+++ b/tests/gold_tests/cache/background_fill.test.py
@@ -54,7 +54,8 @@ class BackgroundFillTest:
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
@@ -112,7 +113,8 @@ class BackgroundFillTest:
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
-""")
+""",
+ 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")
@@ -130,7 +132,8 @@ sleep 4;
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
-""")
+""",
+ 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")
@@ -148,7 +151,8 @@ sleep 5;
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
-""")
+""",
+ 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")
@@ -172,9 +176,10 @@ sleep 5;
def run(self):
self.__testCase0()
- self.__testCase1()
- self.__testCase2()
- self.__testCase3()
+ if not Condition.CurlUsingUnixDomainSocket():
+ self.__testCase1()
+ self.__testCase2()
+ self.__testCase3()
BackgroundFillTest().run()
diff --git a/tests/gold_tests/cache/cache-control.test.py b/tests/gold_tests/cache/cache-control.test.py
index a1c0b00de8..b9a9ea08ca 100644
--- a/tests/gold_tests/cache/cache-control.test.py
+++ b/tests/gold_tests/cache/cache-control.test.py
@@ -71,13 +71,18 @@ ts.Disk.records_config.update(
ts.Disk.remap_config.AddLine('map / http://127.0.0.1:{0}'.format(server.Variables.Port))
+ipv4flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
+
# Test 1 - 200 response and cache fill
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
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))
+ '-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),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/cache_and_req_body-miss.gold"
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/cache/cache-generation-clear.test.py b/tests/gold_tests/cache/cache-generation-clear.test.py
index 07fb23f9a9..2d5e77d853 100644
--- a/tests/gold_tests/cache/cache-generation-clear.test.py
+++ b/tests/gold_tests/cache/cache-generation-clear.test.py
@@ -50,7 +50,8 @@ objectid = uuid.uuid4()
tr = Test.AddTestRun()
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))
+ ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.Processes.Default.Streams.All = "gold/miss_default-1.gold"
@@ -59,7 +60,8 @@ tr.Processes.Default.Streams.All = "gold/miss_default-1.gold"
tr = Test.AddTestRun()
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))
+ ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/hit_default-1.gold"
@@ -76,7 +78,8 @@ tr.DelayStart = 15 # delay start of test run to allow previous command to take
# create a new traffic_ctrl call and the environment
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))
+ ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/miss_default77.gold"
@@ -84,7 +87,8 @@ tr.Processes.Default.Streams.All = "gold/miss_default77.gold"
tr = Test.AddTestRun()
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))
+ ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/hit_default77.gold"
@@ -92,6 +96,7 @@ tr.Processes.Default.Streams.All = "gold/hit_default77.gold"
tr = Test.AddTestRun()
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))
+ ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/hit_default77.gold"
diff --git a/tests/gold_tests/cache/cache-generation-disjoint.test.py b/tests/gold_tests/cache/cache-generation-disjoint.test.py
index 58adffa6cc..9c01fa0505 100644
--- a/tests/gold_tests/cache/cache-generation-disjoint.test.py
+++ b/tests/gold_tests/cache/cache-generation-disjoint.test.py
@@ -50,7 +50,8 @@ objectid = uuid.uuid4()
tr = Test.AddTestRun()
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))
+ ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.Processes.Default.Streams.All = "gold/miss_default-1.gold"
@@ -59,7 +60,8 @@ tr.Processes.Default.Streams.All = "gold/miss_default-1.gold"
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'"http://127.0.0.1:{0}/generation1/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose'.format(
- ts.Variables.port, objectid))
+ ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/miss_gen1.gold"
@@ -67,7 +69,8 @@ tr.Processes.Default.Streams.All = "gold/miss_gen1.gold"
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'"http://127.0.0.1:{0}/generation2/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose'.format(
- ts.Variables.port, objectid))
+ ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/miss_gen2.gold"
@@ -75,7 +78,8 @@ tr.Processes.Default.Streams.All = "gold/miss_gen2.gold"
tr = Test.AddTestRun()
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))
+ ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/hit_default-1.gold"
@@ -83,7 +87,8 @@ tr.Processes.Default.Streams.All = "gold/hit_default-1.gold"
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'"http://127.0.0.1:{0}/generation1/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose'.format(
- ts.Variables.port, objectid))
+ ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/hit_gen1.gold"
@@ -91,6 +96,7 @@ tr.Processes.Default.Streams.All = "gold/hit_gen1.gold"
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'"http://127.0.0.1:{0}/generation2/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose'.format(
- ts.Variables.port, objectid))
+ ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/hit_gen2.gold"
diff --git a/tests/gold_tests/cache/disjoint-wait-for-cache.test.py b/tests/gold_tests/cache/disjoint-wait-for-cache.test.py
index db34b0d378..2570c6a0a0 100644
--- a/tests/gold_tests/cache/disjoint-wait-for-cache.test.py
+++ b/tests/gold_tests/cache/disjoint-wait-for-cache.test.py
@@ -53,7 +53,8 @@ objectid = uuid.uuid4()
tr = Test.AddTestRun()
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))
+ ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.Processes.Default.Streams.All = "gold/miss_default-1.gold"
@@ -62,7 +63,8 @@ tr.Processes.Default.Streams.All = "gold/miss_default-1.gold"
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'"http://127.0.0.1:{0}/generation1/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose -o /dev/null'
- .format(ts.Variables.port, objectid))
+ .format(ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/miss_gen1.gold"
@@ -70,7 +72,8 @@ tr.Processes.Default.Streams.All = "gold/miss_gen1.gold"
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'"http://127.0.0.1:{0}/generation2/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose -o /dev/null'
- .format(ts.Variables.port, objectid))
+ .format(ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/miss_gen2.gold"
@@ -78,7 +81,8 @@ tr.Processes.Default.Streams.All = "gold/miss_gen2.gold"
tr = Test.AddTestRun()
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 -o /dev/null'
- .format(ts.Variables.port, objectid))
+ .format(ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/hit_default-1.gold"
@@ -86,7 +90,8 @@ tr.Processes.Default.Streams.All = "gold/hit_default-1.gold"
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'"http://127.0.0.1:{0}/generation1/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose -o /dev/null'
- .format(ts.Variables.port, objectid))
+ .format(ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/hit_gen1.gold"
@@ -94,6 +99,7 @@ tr.Processes.Default.Streams.All = "gold/hit_gen1.gold"
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'"http://127.0.0.1:{0}/generation2/cache/10/{1}" -H "x-debug: x-cache,x-cache-key,via,x-cache-generation" --verbose -o /dev/null'
- .format(ts.Variables.port, objectid))
+ .format(ts.Variables.port, objectid),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/hit_gen2.gold"
diff --git a/tests/gold_tests/chunked_encoding/bad_chunked_encoding.test.py b/tests/gold_tests/chunked_encoding/bad_chunked_encoding.test.py
index f57861d1b2..103eb2e12b 100644
--- a/tests/gold_tests/chunked_encoding/bad_chunked_encoding.test.py
+++ b/tests/gold_tests/chunked_encoding/bad_chunked_encoding.test.py
@@ -51,7 +51,8 @@ tr = Test.AddTestRun()
tr.TimeOut = 5
tr.MakeCurlCommand(
'-H "host: example.com" -H "transfer-encoding: gzip" -d "stuff" http://127.0.0.1:{0}/case1 --verbose'.format(
- ts.Variables.port))
+ ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
@@ -65,7 +66,8 @@ tr = Test.AddTestRun()
tr.TimeOut = 5
tr.MakeCurlCommand(
'-H "host: example.com" -H "transfer-encoding: gzip" -H "transfer-encoding: chunked" -d "stuff" http://127.0.0.1:{0}/case1 --verbose'
- .format(ts.Variables.port))
+ .format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ContainsExpression("501 Field not implemented", "Should fail")
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("200 OK", "Should not succeed")
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
index adc0d995b2..ab47b5e12e 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
@@ -99,29 +99,39 @@ Test.Setup.Copy(os.path.join(Test.Variables.AtsBuildGoldTestsDir, 'chunked_encod
# HTTP1.1 GET: www.example.com
tr = Test.AddTestRun()
tr.TimeOut = 5
-tr.MakeCurlCommand('--http1.1 --proxy 127.0.0.1:{0} http://www.example.com --verbose'.format(ts.Variables.port))
+if Condition.CurlUsingUnixDomainSocket():
+ tr.MakeCurlCommand('--http1.1 -H "Host: www.example.com" "http://127.0.0.1:{0}" --verbose'.format(ts.Variables.port), ts=ts)
+else:
+ tr.MakeCurlCommand('--http1.1 --proxy 127.0.0.1:{0} http://www.example.com --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(server2)
tr.Processes.Default.StartBefore(server3)
# Delay on readiness of our ssl ports
tr.Processes.Default.StartBefore(Test.Processes.ts)
-tr.Processes.Default.Streams.stderr = "gold/chunked_GET_200.gold"
+if Condition.CurlUsingUnixDomainSocket():
+ tr.Processes.Default.Streams.stderr = "gold/chunked_GET_200_uds.gold"
+else:
+ tr.Processes.Default.Streams.stderr = "gold/chunked_GET_200.gold"
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-# HTTP2 POST: www.example.com Host, chunked body
-tr = Test.AddTestRun()
-tr.TimeOut = 5
-tr.MakeCurlCommand(
- '--http2 -k https://127.0.0.1:{0} --verbose -H "Host: www.anotherexample.com" -d "Knock knock"'.format(ts.Variables.ssl_port))
-tr.Processes.Default.ReturnCode = 0
-tr.Processes.Default.Streams.stderr = "gold/h2_chunked_POST_200.gold"
+if not Condition.CurlUsingUnixDomainSocket():
+ # HTTP2 POST: www.example.com Host, chunked body
+ tr = Test.AddTestRun()
+ tr.TimeOut = 5
+ tr.MakeCurlCommand(
+ '--http2 -k https://127.0.0.1:{0} --verbose -H "Host: www.anotherexample.com" -d "Knock knock"'.format(
+ ts.Variables.ssl_port),
+ ts=ts)
+ tr.Processes.Default.ReturnCode = 0
+ tr.Processes.Default.Streams.stderr = "gold/h2_chunked_POST_200.gold"
# HTTP1.1 POST: www.yetanotherexample.com Host, explicit size
tr = Test.AddTestRun()
tr.TimeOut = 5
-tr.MakeCurlCommand('http://127.0.0.1:{0} -H "Host: www.yetanotherexample.com" --verbose -d "knock knock"'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ 'http://127.0.0.1:{0} -H "Host: www.yetanotherexample.com" --verbose -d "knock knock"'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/chunked_POST_200.gold"
tr.StillRunningAfter = server
@@ -131,7 +141,8 @@ tr = Test.AddTestRun()
tr.TimeOut = 5
tr.MakeCurlCommand(
'http://127.0.0.1:{0} -H "Host: www.yetanotherexample.com" --verbose -H "Transfer-Encoding: chunked" -d "Knock knock"'.format(
- ts.Variables.port))
+ ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/chunked_POST_200.gold"
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
index 318a1d5eaa..004267c2d6 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
@@ -19,6 +19,7 @@
Test.Summary = '''
Test interaction of H2 and chunked encoding
'''
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
Test.SkipUnless(
Condition.HasProgram("nghttp", "Nghttp need to be installed on system for this test to work"),
@@ -83,7 +84,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server2)
tr.MakeCurlCommand(
'--http2 -k https://127.0.0.1:{}/post-full --verbose -H "Transfer-encoding: chunked" -d "Knock knock"'.format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 200", "Request should succeed")
tr.Processes.Default.Streams.All += Testers.ContainsExpression("< content-length:", "Response should include content length")
@@ -98,7 +100,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server3)
tr.MakeCurlCommand(
'--http2 -k https://127.0.0.1:{}/post-chunked --verbose -H "Transfer-encoding: chunked" -d "Knock knock"'.format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 200", "Request should succeed")
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("< content-length:", "Response should not include content length")
diff --git a/tests/gold_tests/chunked_encoding/gold/chunked_GET_200.gold b/tests/gold_tests/chunked_encoding/gold/chunked_GET_200.gold
index ddf57d3d3e..cd12191709 100644
--- a/tests/gold_tests/chunked_encoding/gold/chunked_GET_200.gold
+++ b/tests/gold_tests/chunked_encoding/gold/chunked_GET_200.gold
@@ -1,5 +1,5 @@
``
-> GET http://www.example.com/ HTTP/1.1
+> GET `` HTTP/1.1
> Host: www.example.com``
> User-Agent: curl/``
> Accept: */*
diff --git a/tests/gold_tests/chunked_encoding/gold/chunked_GET_200.gold b/tests/gold_tests/chunked_encoding/gold/chunked_GET_200_uds.gold
similarity index 68%
copy from tests/gold_tests/chunked_encoding/gold/chunked_GET_200.gold
copy to tests/gold_tests/chunked_encoding/gold/chunked_GET_200_uds.gold
index ddf57d3d3e..e2b5594b73 100644
--- a/tests/gold_tests/chunked_encoding/gold/chunked_GET_200.gold
+++ b/tests/gold_tests/chunked_encoding/gold/chunked_GET_200_uds.gold
@@ -1,5 +1,5 @@
``
-> GET http://www.example.com/ HTTP/1.1
+> GET `` HTTP/1.1
> Host: www.example.com``
> User-Agent: curl/``
> Accept: */*
@@ -9,5 +9,5 @@
< Date:``
< Age: ``
< Transfer-Encoding: chunked``
-< Proxy-Connection: keep-alive``
+< Connection: keep-alive``
``
diff --git a/tests/gold_tests/connect/connect.test.py b/tests/gold_tests/connect/connect.test.py
index f6ff46670c..a49a9a33e7 100644
--- a/tests/gold_tests/connect/connect.test.py
+++ b/tests/gold_tests/connect/connect.test.py
@@ -48,7 +48,7 @@ class ConnectTest:
{
'proxy.config.diags.debug.enabled': 1,
'proxy.config.diags.debug.tags': 'http',
- 'proxy.config.http.server_ports': f"{self.ts.Variables.port}",
+ 'proxy.config.http.server_ports': f"{self.ts.Variables.port} {self.ts.Variables.uds_path}",
'proxy.config.http.connect_ports': f"{self.httpbin.Variables.Port}",
})
@@ -84,11 +84,15 @@ logging:
def __testCase0(self):
tr = Test.AddTestRun()
self.__checkProcessBefore(tr)
- tr.MakeCurlCommand(f"-v --fail -s -p -x 127.0.0.1:{self.ts.Variables.port} 'http://foo.com/get'")
+ if Condition.CurlUsingUnixDomainSocket():
+ tr.MakeCurlCommand(f"-v --fail -s -X CONNECT -p -x 127.0.0.1:{self.ts.Variables.port} 'http://foo.com/get'", ts=self.ts)
+ tr.Processes.Default.Streams.stderr = "gold/connect_0_stderr_uds.gold"
+ else:
+ tr.MakeCurlCommand(f"-v --fail -s -p -x 127.0.0.1:{self.ts.Variables.port} 'http://foo.com/get'", ts=self.ts)
+ tr.Processes.Default.Streams.stderr = "gold/connect_0_stderr.gold"
+ tr.Processes.Default.Streams.stderr = Testers.ContainsExpression(
+ f'Connected to 127.0.0.1.*{self.ts.Variables.port}', 'Curl should connect through the ATS proxy port.')
tr.Processes.Default.ReturnCode = 0
- tr.Processes.Default.Streams.stderr = "gold/connect_0_stderr.gold"
- tr.Processes.Default.Streams.stderr = Testers.ContainsExpression(
- f'Connected to 127.0.0.1.*{self.ts.Variables.port}', 'Curl should connect through the ATS proxy port.')
tr.Processes.Default.TimeOut = 3
self.__checkProcessAfter(tr)
@@ -216,7 +220,7 @@ class ConnectViaPVTest2:
'proxy.config.diags.debug.tags': 'http|hpack',
'proxy.config.ssl.server.cert.path': f'{self.ts.Variables.SSLDir}',
'proxy.config.ssl.server.private_key.path': f'{self.ts.Variables.SSLDir}',
- 'proxy.config.http.server_ports': f"{self.ts.Variables.ssl_port}:ssl",
+ 'proxy.config.http.server_ports': f"{self.ts.Variables.ssl_port}:ssl {self.ts.Variables.uds_path}",
'proxy.config.http.connect_ports': f"{self.server.Variables.http_port}",
})
diff --git a/tests/gold_tests/connect/gold/connect_0_stderr_uds.gold b/tests/gold_tests/connect/gold/connect_0_stderr_uds.gold
new file mode 100644
index 0000000000..60d4b8d898
--- /dev/null
+++ b/tests/gold_tests/connect/gold/connect_0_stderr_uds.gold
@@ -0,0 +1,19 @@
+``
+* Connected to `` port ``
+``
+> CONNECT /get HTTP/1.1
+> Host: foo.com
+``
+>``
+< HTTP/1.1 200 OK
+``
+<``
+`` CONNECT ``
+``
+> GET /get HTTP/1.1
+> Host: foo.com
+>``
+< HTTP/1.1 200 OK
+``
+<``
+``
diff --git a/tests/gold_tests/continuations/double.test.py b/tests/gold_tests/continuations/double.test.py
index 7eedeba40c..24053fd170 100644
--- a/tests/gold_tests/continuations/double.test.py
+++ b/tests/gold_tests/continuations/double.test.py
@@ -68,7 +68,7 @@ tr = Test.AddTestRun()
# Create a bunch of curl commands to be executed in parallel. Default.Process is set in SpawnCurlCommands.
# On Fedora 28/29, it seems that curl will occasionally timeout after a couple seconds and return exitcode 2
# Examining the packet capture shows that Traffic Server dutifully sends the response
-ps = tr.SpawnCurlCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2))
+ps = tr.SpawnCurlCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2), ts=ts)
tr.Processes.Default.Env = ts.Env
tr.Processes.Default.ReturnCode = Any(0, 2)
diff --git a/tests/gold_tests/continuations/double_h2.test.py b/tests/gold_tests/continuations/double_h2.test.py
index 52298b37bb..cb81c2d83a 100644
--- a/tests/gold_tests/continuations/double_h2.test.py
+++ b/tests/gold_tests/continuations/double_h2.test.py
@@ -23,6 +23,7 @@ Test.Summary = '''
Test transactions and sessions for http2, making sure the two continuations catch the same number of hooks.
'''
Test.SkipUnless(Condition.HasCurlFeature('http2'))
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
Test.ContinueOnFail = True
# Define default ATS. Disable the cache to simplify the test.
ts = Test.MakeATSProcess("ts", enable_tls=True, enable_cache=False)
@@ -80,7 +81,7 @@ tr = Test.AddTestRun()
# Create a bunch of curl commands to be executed in parallel. Default.Process is set in SpawnCurlCommands.
# On Fedora 28/29, it seems that curl will occasionally timeout after a couple seconds and return exitcode 2
# Examining the packet capture shows that Traffic Server dutifully sends the response
-ps = tr.SpawnCurlCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2))
+ps = tr.SpawnCurlCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2), ts=ts)
tr.Processes.Default.Env = ts.Env
tr.Processes.Default.ReturnCode = Any(0, 2)
diff --git a/tests/gold_tests/continuations/openclose.test.py b/tests/gold_tests/continuations/openclose.test.py
index fafc6a5702..df7ce0bbdb 100644
--- a/tests/gold_tests/continuations/openclose.test.py
+++ b/tests/gold_tests/continuations/openclose.test.py
@@ -59,7 +59,7 @@ tr = Test.AddTestRun()
# Create a bunch of curl commands to be executed in parallel. Default.Process is set in SpawnCurlCommands.
# On Fedora 28/29, it seems that curl will occasionally timeout after a couple seconds and return exitcode 2
# Examining the packet capture shows that Traffic Server dutifully sends the response
-ps = tr.SpawnCurlCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2))
+ps = tr.SpawnCurlCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2), ts=ts)
tr.Processes.Default.Env = ts.Env
tr.Processes.Default.ReturnCode = Any(0, 2)
diff --git a/tests/gold_tests/continuations/openclose_h2.test.py b/tests/gold_tests/continuations/openclose_h2.test.py
index da1f8eef84..8cbeb01055 100644
--- a/tests/gold_tests/continuations/openclose_h2.test.py
+++ b/tests/gold_tests/continuations/openclose_h2.test.py
@@ -24,6 +24,7 @@ Test transactions and sessions over http2, making sure they open and close in th
'''
Test.SkipUnless(Condition.HasCurlFeature('http2'))
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
# Define default ATS. Disable the cache to simplify the test.
ts = Test.MakeATSProcess("ts", enable_tls=True, enable_cache=False)
@@ -67,7 +68,7 @@ tr = Test.AddTestRun()
# Create a bunch of curl commands to be executed in parallel. Default.Process is set in SpawnCurlCommands.
# On Fedora 28/29, it seems that curl will occasionally timeout after a couple seconds and return exitcode 2
# Examining the packet capture shows that Traffic Server dutifully sends the response
-ps = tr.SpawnCurlCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2))
+ps = tr.SpawnCurlCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2), ts=ts)
tr.Processes.Default.Env = ts.Env
tr.Processes.Default.ReturnCode = Any(0, 2)
diff --git a/tests/gold_tests/continuations/session_id.test.py b/tests/gold_tests/continuations/session_id.test.py
index 47f22eba18..5c20d02558 100644
--- a/tests/gold_tests/continuations/session_id.test.py
+++ b/tests/gold_tests/continuations/session_id.test.py
@@ -65,7 +65,7 @@ numberOfRequests = 100
# is set in SpawnCurlCommands. On Fedora 28/29, it seems that curl will
# occasionally timeout after a couple seconds and return exitcode 2
# Examining the packet capture shows that Traffic Server dutifully sends the response
-ps = tr.SpawnCurlCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2))
+ps = tr.SpawnCurlCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2), ts=ts)
tr.Processes.Default.Env = ts.Env
tr.Processes.Default.ReturnCode = Any(0, 2)
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
@@ -79,11 +79,12 @@ tr.StillRunningAfter = server
#
# Run some HTTP/2 traffic.
#
-tr = Test.AddTestRun("Perform HTTP/2 transactions")
-cmd = '-v -k --http2 -H "host:example.com" https://127.0.0.1:{0}'.format(ts.Variables.ssl_port)
-ps = tr.SpawnCurlCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2))
-tr.Processes.Default.Env = ts.Env
-tr.Processes.Default.ReturnCode = Any(0, 2)
+if not Condition.CurlUsingUnixDomainSocket():
+ tr = Test.AddTestRun("Perform HTTP/2 transactions")
+ cmd = '-v -k --http2 -H "host:example.com" https://127.0.0.1:{0}'.format(ts.Variables.ssl_port)
+ ps = tr.SpawnCurlCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2), ts=ts)
+ tr.Processes.Default.Env = ts.Env
+ tr.Processes.Default.ReturnCode = Any(0, 2)
#
# Verify that the session ids are unique.
@@ -96,7 +97,10 @@ tr.Processes.Default.ReturnCode = Any(0, 2)
def verify_session_count(output):
global numberOfRequests
- nReq = numberOfRequests * 2
+ if Condition.CurlUsingUnixDomainSocket():
+ nReq = numberOfRequests
+ else:
+ nReq = numberOfRequests * 2
session_ids = [line[0:line.find("\n")] for line in str(output).split("session id: ")[1:]]
if len(session_ids) != nReq:
return "Found {} session_id's, expected {}".format(len(session_ids), nReq)
diff --git a/tests/gold_tests/cripts/cripts.test.py b/tests/gold_tests/cripts/cripts.test.py
index 1e6b9ba7e0..32d9cc8702 100644
--- a/tests/gold_tests/cripts/cripts.test.py
+++ b/tests/gold_tests/cripts/cripts.test.py
@@ -71,7 +71,7 @@ class CriptsBasicTest:
def runHeaderTest(self):
tr = Test.AddTestRun('Exercise traffic through cripts.')
- tr.MakeCurlCommand(f'-v -H "Host: www.example.com" http://127.0.0.1:{self.ts.Variables.port}')
+ tr.MakeCurlCommand(f'-v -H "Host: www.example.com" http://127.0.0.1:{self.ts.Variables.port}', ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(self.server, ready=When.PortOpen(self.server.Variables.Port))
tr.Processes.Default.StartBefore(self.ts)
diff --git a/tests/gold_tests/dns/splitdns.test.py b/tests/gold_tests/dns/splitdns.test.py
index eff722417d..c6f2031176 100644
--- a/tests/gold_tests/dns/splitdns.test.py
+++ b/tests/gold_tests/dns/splitdns.test.py
@@ -50,7 +50,7 @@ class SplitDNSTest:
def addTestCase0(self):
tr = Test.AddTestRun()
- tr.MakeCurlCommand(f"-v http://localhost:{self.ts.Variables.port}/foo/")
+ tr.MakeCurlCommand(f"-v http://localhost:{self.ts.Variables.port}/foo/", ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/test_case_0_stderr.gold"
tr.Processes.Default.StartBefore(self.dns)
@@ -62,7 +62,7 @@ class SplitDNSTest:
def addTestCase1(self):
tr = Test.AddTestRun()
- tr.MakeCurlCommand(f"-v http://localhost:{self.ts.Variables.port}/bar/")
+ tr.MakeCurlCommand(f"-v http://localhost:{self.ts.Variables.port}/bar/", ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/test_case_1_stderr.gold"
tr.StillRunningAfter = self.dns
diff --git a/tests/gold_tests/early_hints/early_hints.test.py b/tests/gold_tests/early_hints/early_hints.test.py
index 7bacf4144a..84c7a760ed 100644
--- a/tests/gold_tests/early_hints/early_hints.test.py
+++ b/tests/gold_tests/early_hints/early_hints.test.py
@@ -135,7 +135,8 @@ class TestEarlyHints:
f'-v {protocol_arg} '
f'--resolve "server.com:{ts_port}:127.0.0.1" '
f'-H "Host: server.com" '
- f'{scheme}://server.com:{ts_port}/{self._protocol_str}')
+ f'{scheme}://server.com:{ts_port}/{self._protocol_str}',
+ ts=self._ts)
client.ReturnCode = 0
self._ts.StartBefore(self._dns)
@@ -154,5 +155,6 @@ class TestEarlyHints:
TestEarlyHints(Protocol.HTTP)
-TestEarlyHints(Protocol.HTTPS)
-TestEarlyHints(Protocol.HTTP2)
+if not Condition.CurlUsingUnixDomainSocket():
+ TestEarlyHints(Protocol.HTTPS)
+ TestEarlyHints(Protocol.HTTP2)
diff --git a/tests/gold_tests/forward_proxy/forward_proxy.test.py b/tests/gold_tests/forward_proxy/forward_proxy.test.py
index fddf1351fe..49dd714bed 100644
--- a/tests/gold_tests/forward_proxy/forward_proxy.test.py
+++ b/tests/gold_tests/forward_proxy/forward_proxy.test.py
@@ -20,6 +20,7 @@ from typing import Union
Test.Summary = 'Verify ATS can function as a forward proxy'
Test.ContinueOnFail = True
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
class ForwardProxyTest:
@@ -84,7 +85,8 @@ class ForwardProxyTest:
tr.MakeCurlCommand(
f'--proxy-insecure -v -H "uuid: 1" '
f'--proxy "https://127.0.0.1:{self.ts.Variables.ssl_port}/" '
- f'http://example.com/')
+ f'http://example.com/',
+ ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = self.server
tr.StillRunningAfter = self.ts
diff --git a/tests/gold_tests/h2/h2disable.test.py b/tests/gold_tests/h2/h2disable.test.py
index 39a6af935b..9e645419e0 100644
--- a/tests/gold_tests/h2/h2disable.test.py
+++ b/tests/gold_tests/h2/h2disable.test.py
@@ -58,7 +58,7 @@ ts.Disk.sni_yaml.AddLines([
])
tr = Test.AddTestRun("Negotiate-h2")
-tr.MakeCurlCommand("-v -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -70,7 +70,7 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("[Uu]sing HTTP/?2
tr.TimeOut = 5
tr2 = Test.AddTestRun("Do not negotiate h2")
-tr2.MakeCurlCommand("-v -k --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("-v -k --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.Processes.Default.TimeOut = 5
@@ -80,7 +80,7 @@ tr2.Processes.Default.Streams.All += Testers.ExcludesExpression("[Uu]sing HTTP/?
tr2.TimeOut = 5
tr2 = Test.AddTestRun("Do not negotiate h2")
-tr2.MakeCurlCommand("-v -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("-v -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.Processes.Default.TimeOut = 5
diff --git a/tests/gold_tests/h2/h2disable_no_accept_threads.test.py b/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
index e5f6a19226..3fc0a1d502 100644
--- a/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
+++ b/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
@@ -58,7 +58,7 @@ ts.Disk.sni_yaml.AddLines([
])
tr = Test.AddTestRun("Negotiate-h2")
-tr.MakeCurlCommand("-v -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -70,7 +70,7 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("[Uu]sing HTTP/?2
tr.TimeOut = 5
tr2 = Test.AddTestRun("Do not negotiate h2")
-tr2.MakeCurlCommand("-v -k --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("-v -k --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.Processes.Default.TimeOut = 5
@@ -80,7 +80,7 @@ tr2.Processes.Default.Streams.All += Testers.ExcludesExpression("[Uu]sing HTTP/?
tr2.TimeOut = 5
tr2 = Test.AddTestRun("Do not negotiate h2")
-tr2.MakeCurlCommand("-v -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("-v -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.Processes.Default.TimeOut = 5
diff --git a/tests/gold_tests/h2/h2enable.test.py b/tests/gold_tests/h2/h2enable.test.py
index 64286541a2..36eb2fc761 100644
--- a/tests/gold_tests/h2/h2enable.test.py
+++ b/tests/gold_tests/h2/h2enable.test.py
@@ -58,7 +58,7 @@ ts.Disk.sni_yaml.AddLines([
])
tr = Test.AddTestRun("Do-not-Negotiate-h2")
-tr.MakeCurlCommand("-v -k --ipv4 --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v -k --ipv4 --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -70,7 +70,7 @@ tr.Processes.Default.Streams.All += Testers.ExcludesExpression("[Uu]sing HTTP/?2
tr.TimeOut = 10
tr2 = Test.AddTestRun("Do negotiate h2")
-tr2.MakeCurlCommand("-v -k --ipv4 --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("-v -k --ipv4 --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.Processes.Default.TimeOut = 10
@@ -80,7 +80,8 @@ tr2.Processes.Default.Streams.All += Testers.ContainsExpression("[Uu]sing HTTP/?
tr2.TimeOut = 10
tr2 = Test.AddTestRun("Do negotiate h2")
-tr2.MakeCurlCommand("-v -k --ipv4 --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand(
+ "-v -k --ipv4 --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.Processes.Default.TimeOut = 10
diff --git a/tests/gold_tests/h2/h2enable_no_accept_threads.test.py b/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
index 24fb2536a2..c07aceec66 100644
--- a/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
+++ b/tests/gold_tests/h2/h2enable_no_accept_threads.test.py
@@ -58,7 +58,7 @@ ts.Disk.sni_yaml.AddLines([
])
tr = Test.AddTestRun("Do-not-Negotiate-h2")
-tr.MakeCurlCommand("-v -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -70,7 +70,7 @@ tr.Processes.Default.Streams.All += Testers.ExcludesExpression("[Uu]sing HTTP/?2
tr.TimeOut = 5
tr2 = Test.AddTestRun("Do negotiate h2")
-tr2.MakeCurlCommand("-v -k --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("-v -k --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.Processes.Default.TimeOut = 5
@@ -80,7 +80,7 @@ tr2.Processes.Default.Streams.All += Testers.ContainsExpression("[Uu]sing HTTP/?
tr2.TimeOut = 5
tr2 = Test.AddTestRun("Do negotiate h2")
-tr2.MakeCurlCommand("-v -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("-v -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.Processes.Default.TimeOut = 5
diff --git a/tests/gold_tests/h2/http2.test.py b/tests/gold_tests/h2/http2.test.py
index cc13554628..1635615dda 100644
--- a/tests/gold_tests/h2/http2.test.py
+++ b/tests/gold_tests/h2/http2.test.py
@@ -203,7 +203,8 @@ tr.StillRunningAfter = server
# on the post body
tr = Test.AddTestRun("post with chunked body")
tr.MakeCurlCommand(
- '-s -k -H "Transfer-Encoding: chunked" -d "{0}" https://127.0.0.1:{1}/postchunked'.format(post_body, ts.Variables.ssl_port))
+ '-s -k -H "Transfer-Encoding: chunked" -d "{0}" https://127.0.0.1:{1}/postchunked'.format(post_body, ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/post_chunked.gold"
tr.StillRunningAfter = server
@@ -213,7 +214,8 @@ tr.StillRunningAfter = server
# on the post body
tr = Test.AddTestRun("post with big chunked body")
tr.MakeCurlCommand(
- '-s -k -H "Transfer-Encoding: chunked" -d @big_post_body https://127.0.0.1:{0}/bigpostchunked'.format(ts.Variables.ssl_port))
+ '-s -k -H "Transfer-Encoding: chunked" -d @big_post_body https://127.0.0.1:{0}/bigpostchunked'.format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = "gold/post_chunked.gold"
tr.StillRunningAfter = server
@@ -223,7 +225,7 @@ tr = Test.AddTestRun("huge response header")
# Different versions of curl have "bytes data" at various places in the output.
# Normalize them by simply filtering out those lines since they are not
# important to this test.
-tr.MakeCurlCommand(f'-vs -k --http2 https://127.0.0.1:{ts.Variables.ssl_port}/huge_resp_hdrs |& grep -v "bytes data"')
+tr.MakeCurlCommand(f'-vs -k --http2 https://127.0.0.1:{ts.Variables.ssl_port}/huge_resp_hdrs |& grep -v "bytes data"', ts=ts)
tr.Processes.Default.ReturnCode = 0
# Different versions of curl will have different cases for HTTP/2 field names.
tr.Processes.Default.Streams.stdout = Testers.GoldFile("gold/http2_8_stdout.gold", case_insensitive=True)
@@ -231,7 +233,7 @@ tr.StillRunningAfter = server
# Test Case 9: Header Only Response - e.g. 204
tr = Test.AddTestRun("header only response")
-tr.MakeCurlCommand('-vs -k --http2 https://127.0.0.1:{0}/status/204'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-vs -k --http2 https://127.0.0.1:{0}/status/204'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/http2_9_stdout.gold"
# Different versions of curl will have different cases for HTTP/2 field names.
diff --git a/tests/gold_tests/h2/http2_priority.test.py b/tests/gold_tests/h2/http2_priority.test.py
index 70543ee0c5..64b58c3fdb 100644
--- a/tests/gold_tests/h2/http2_priority.test.py
+++ b/tests/gold_tests/h2/http2_priority.test.py
@@ -69,7 +69,7 @@ ts.Disk.records_config.update(
# Test Case 0:
tr = Test.AddTestRun()
-tr.MakeCurlCommand('-vs -k --http2 https://127.0.0.1:{0}/bigfile | cksum'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-vs -k --http2 https://127.0.0.1:{0}/bigfile | cksum'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.TimeOut = 5
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
diff --git a/tests/gold_tests/h2/httpbin.test.py b/tests/gold_tests/h2/httpbin.test.py
index 1d2df3e7b0..f567efa241 100644
--- a/tests/gold_tests/h2/httpbin.test.py
+++ b/tests/gold_tests/h2/httpbin.test.py
@@ -81,7 +81,7 @@ json_printer = f'''
# Test Case 0: Basic request and response
test_run = Test.AddTestRun()
-test_run.MakeCurlCommand("-vs -k --http2 https://127.0.0.1:{0}/get | {1}".format(ts.Variables.ssl_port, json_printer))
+test_run.MakeCurlCommand("-vs -k --http2 https://127.0.0.1:{0}/get | {1}".format(ts.Variables.ssl_port, json_printer), ts=ts)
test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.StartBefore(httpbin, ready=When.PortOpen(httpbin.Variables.Port))
test_run.Processes.Default.StartBefore(Test.Processes.ts)
@@ -93,7 +93,7 @@ test_run.StillRunningAfter = httpbin
# Test Case 1: Attempt an empty response body.
# This test case requires go-httpbin@v2.6.0 or later.
test_run = Test.AddTestRun()
-test_run.MakeCurlCommand('-vs -k --http2 https://127.0.0.1:{0}/bytes/0'.format(ts.Variables.ssl_port))
+test_run.MakeCurlCommand('-vs -k --http2 https://127.0.0.1:{0}/bytes/0'.format(ts.Variables.ssl_port), ts=ts)
test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.Streams.stdout = "gold/httpbin_1_stdout.gold"
# Different versions of curl will have different cases for HTTP/2 field names.
@@ -102,7 +102,8 @@ test_run.StillRunningAfter = httpbin
# Test Case 2: Chunked
test_run = Test.AddTestRun()
-test_run.MakeCurlCommand('-vs -k --http2 https://127.0.0.1:{0}/stream-bytes/102400?seed=0 | cksum'.format(ts.Variables.ssl_port))
+test_run.MakeCurlCommand(
+ '-vs -k --http2 https://127.0.0.1:{0}/stream-bytes/102400?seed=0 | cksum'.format(ts.Variables.ssl_port), ts=ts)
test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.Streams.stdout = "gold/httpbin_2_stdout.gold"
# Different versions of curl will have different cases for HTTP/2 field names.
@@ -113,7 +114,8 @@ test_run.StillRunningAfter = httpbin
test_run = Test.AddTestRun()
test_run.MakeCurlCommand(
"-vs -k --http2 https://127.0.0.1:{0}/post --data 'key=value' -H 'Expect: 100-continue' --max-time 5 | {1}".format(
- ts.Variables.ssl_port, json_printer))
+ ts.Variables.ssl_port, json_printer),
+ ts=ts)
test_run.Processes.Default.ReturnCode = 0
test_run.Processes.Default.Streams.stdout = "gold/httpbin_3_stdout.gold"
# Different versions of curl will have different cases for HTTP/2 field names.
diff --git a/tests/gold_tests/headers/accept_webp.test.py b/tests/gold_tests/headers/accept_webp.test.py
index 8fdd4041a2..249534a1d1 100644
--- a/tests/gold_tests/headers/accept_webp.test.py
+++ b/tests/gold_tests/headers/accept_webp.test.py
@@ -20,6 +20,7 @@ Test how we handle image/webp
Test.Summary = '''
Checking that we don't serve image/webp to clients that do not support it
'''
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
Test.ContinueOnFail = True
@@ -60,7 +61,8 @@ tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Po
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.MakeCurlCommand(
'-s -D - -v --ipv4 --http1.1 -H "Accept: image/webp,image/png,image/svg+xml,image/*;q=0.8,video/*;q=0.8,*/*;q=0.5" -H "Host: www.example.com" http://localhost:{0}/'
- .format(ts.Variables.port))
+ .format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/accept_webp.gold"
tr.StillRunningAfter = ts
@@ -69,7 +71,8 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'-s -D - -v --ipv4 --http1.1 -H "Accept: image/webp,image/png,image/svg+xml,image/*;q=0.8,video/*;q=0.8,*/*;q=0.5" -H "Host: www.example.com" http://localhost:{0}/'
- .format(ts.Variables.port))
+ .format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/accept_webp_cache.gold"
tr.StillRunningAfter = ts
@@ -78,7 +81,8 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'-s -D - -v --ipv4 --http1.1 -H "Accept: image/png,image/svg+xml,image/*;q=0.8,video/*;q=0.8,*/*;q=0.5" -H "Host: www.example.com" http://localhost:{0}/'
- .format(ts.Variables.port))
+ .format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/accept_webp_jpeg.gold"
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/headers/cache_and_req_body.test.py b/tests/gold_tests/headers/cache_and_req_body.test.py
index 91ad4299d3..b7102056b5 100644
--- a/tests/gold_tests/headers/cache_and_req_body.test.py
+++ b/tests/gold_tests/headers/cache_and_req_body.test.py
@@ -20,7 +20,7 @@ Test cached responses and requests with bodies using CurlHeader tester
Test.Summary = '''
Test cached responses and requests with bodies using CurlHeader tester
'''
-
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
Test.ContinueOnFail = True
# Define default ATS
@@ -126,7 +126,8 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
tr.MakeCurlCommand(
'-s -D - -v --ipv4 --http1.1 -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{port}/'.format(
- port=ts.Variables.port))
+ port=ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.CurlHeader(cache_and_req_body_miss)
tr.StillRunningAfter = ts
@@ -135,7 +136,8 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'-s -D - -v --ipv4 --http1.1 -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{}'.format(
- ts.Variables.port))
+ ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.CurlHeader(cache_and_req_body_hit)
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/headers/cachedIMSRange.test.py b/tests/gold_tests/headers/cachedIMSRange.test.py
index 774a0be8a2..64af159c9f 100644
--- a/tests/gold_tests/headers/cachedIMSRange.test.py
+++ b/tests/gold_tests/headers/cachedIMSRange.test.py
@@ -132,13 +132,18 @@ ts.Disk.remap_config.AddLines(
ts.Disk.MakeConfigFile(regex_remap_conf_file).AddLine(f'//.*/ http://127.0.0.1:{server.Variables.Port} @status=304')
+ipv4flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
+
# Test 0 - Fill a 3 byte object with Last-Modified time into cache.
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -H"UID: Fill" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{0}/'
- .format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -H"UID: Fill" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{1}/'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "cache_and_req_body-miss.gold"
tr.StillRunningAfter = ts
@@ -150,8 +155,9 @@ tr.StillRunningAfter = server
tr = Test.AddTestRun()
tr.DelayStart = 2
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -H"UID: IMS" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{0}/'
- .format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -H"UID: IMS" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{1}/'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "cache_and_req_body-hit-stale.gold"
tr.StillRunningAfter = ts
@@ -163,8 +169,9 @@ tr.StillRunningAfter = server
tr = Test.AddTestRun()
tr.DelayStart = 2
tr.MakeCurlCommand(
- '--range 0-1 -s -D - -v --ipv4 --http1.1 -H"UID: IMS" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{0}/'
- .format(ts.Variables.port))
+ '--range 0-1 -s -D - -v {0} --http1.1 -H"UID: IMS" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{1}/'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "cache_and_req_body-hit-stale-206.gold"
tr.StillRunningAfter = ts
@@ -172,30 +179,32 @@ tr.StillRunningAfter = server
# Test 3 - Test 304 response served from a regex-remap rule with HTTP.
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f'-vs http://127.0.0.1:{ts.Variables.port}/ -H "Host: {default_304_host}"')
+tr.MakeCurlCommand(f'-vs http://127.0.0.1:{ts.Variables.port}/ -H "Host: {default_304_host}"', ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.GoldFile("gold/http1_304.gold", case_insensitive=True)
tr.StillRunningAfter = server
-# Test 4 - Test 304 response served from a regex-remap rule with HTTPS.
-tr = Test.AddTestRun()
-tr.MakeCurlCommand(f'-vs -k https://127.0.0.1:{ts.Variables.ssl_port}/ -H "Host: {default_304_host}"')
-tr.Processes.Default.ReturnCode = 0
-tr.Processes.Default.Streams.All = Testers.GoldFile("gold/http1_304.gold", case_insensitive=True)
-tr.StillRunningAfter = server
+if not Condition.CurlUsingUnixDomainSocket():
+ # Test 4 - Test 304 response served from a regex-remap rule with HTTPS.
+ tr = Test.AddTestRun()
+ tr.MakeCurlCommand(f'-vs -k https://127.0.0.1:{ts.Variables.ssl_port}/ -H "Host: {default_304_host}"', ts=ts)
+ tr.Processes.Default.ReturnCode = 0
+ tr.Processes.Default.Streams.All = Testers.GoldFile("gold/http1_304.gold", case_insensitive=True)
+ tr.StillRunningAfter = server
-# Test 5 - Test 304 response served from a regex-remap rule with HTTP/2.
-tr = Test.AddTestRun()
-tr.MakeCurlCommand(f'-vs -k --http2 https://127.0.0.1:{ts.Variables.ssl_port}/ -H "Host: {default_304_host}"')
-tr.Processes.Default.ReturnCode = 0
-tr.Processes.Default.Streams.All = Testers.GoldFile("gold/http2_304.gold", case_insensitive=True)
-tr.StillRunningAfter = server
+ # Test 5 - Test 304 response served from a regex-remap rule with HTTP/2.
+ tr = Test.AddTestRun()
+ tr.MakeCurlCommand(f'-vs -k --http2 https://127.0.0.1:{ts.Variables.ssl_port}/ -H "Host: {default_304_host}"', ts=ts)
+ tr.Processes.Default.ReturnCode = 0
+ tr.Processes.Default.Streams.All = Testers.GoldFile("gold/http2_304.gold", case_insensitive=True)
+ tr.StillRunningAfter = server
# Test 6 - Fill a new object with an Etag. Not checking the output here.
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -H"UID: EtagFill" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{0}/etag'
- .format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -H"UID: EtagFill" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{1}/etag'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -206,8 +215,9 @@ tr.StillRunningAfter = server
tr = Test.AddTestRun()
tr.DelayStart = 2
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -H"UID: INM" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{0}/etag'
- .format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -H"UID: INM" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{1}/etag'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "cache_and_req_body-hit-stale-INM.gold"
tr.StillRunningAfter = ts
@@ -219,8 +229,9 @@ tr.StillRunningAfter = server
tr = Test.AddTestRun()
tr.DelayStart = 2
tr.MakeCurlCommand(
- '--range 0-1 -s -D - -v --ipv4 --http1.1 -H"UID: INM" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{0}/etag'
- .format(ts.Variables.port))
+ '--range 0-1 -s -D - -v {0} --http1.1 -H"UID: INM" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{1}/etag'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "cache_and_req_body-hit-stale-206-etag.gold"
tr.StillRunningAfter = ts
@@ -230,8 +241,9 @@ tr.StillRunningAfter = server
tr = Test.AddTestRun()
tr.DelayStart = 3
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -H"UID: noBody" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{0}/'
- .format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -H"UID: noBody" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{1}/'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "cache_and_req_nobody-hit-stale.gold"
tr.StillRunningAfter = ts
@@ -241,8 +253,9 @@ tr.StillRunningAfter = server
tr = Test.AddTestRun()
tr.DelayStart = 3
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -H"UID: noBody" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{0}/'
- .format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -H"UID: noBody" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{1}/'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "cache_and_req_nobody-hit-stale.gold"
tr.StillRunningAfter = ts
@@ -252,8 +265,9 @@ tr.StillRunningAfter = server
tr = Test.AddTestRun()
tr.DelayStart = 2
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -H"UID: EtagError" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{0}/etag'
- .format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -H"UID: EtagError" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{1}/etag'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "cache_and_error_nobody.gold"
tr.StillRunningAfter = ts
@@ -263,8 +277,9 @@ tr.StillRunningAfter = server
tr = Test.AddTestRun()
tr.DelayStart = 2
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -H"UID: EtagError" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{0}/etag'
- .format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -H"UID: EtagError" -H "x-debug: x-cache,x-cache-key,via" -H "Host: www.example.com" http://localhost:{1}/etag'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "cache_and_error_nobody.gold"
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/headers/field_name_space.test.py b/tests/gold_tests/headers/field_name_space.test.py
index 015254c00e..cd76ee74b0 100644
--- a/tests/gold_tests/headers/field_name_space.test.py
+++ b/tests/gold_tests/headers/field_name_space.test.py
@@ -38,11 +38,16 @@ server.addResponse("sessionlog.json", request_header, response_header)
ts.Disk.remap_config.AddLine('map http://www.example.com http://127.0.0.1:{0}'.format(server.Variables.Port))
+ipv4flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
+
# Test spaces at the end of the field name and before the :
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand('-s -D - -v --ipv4 --http1.1 -H "Host: www.example.com" http://localhost:{0}/'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '-s -D - -v {0} --http1.1 -H "Host: www.example.com" http://localhost:{1}/'.format(ipv4flag, ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/field_name_space.gold"
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/headers/forwarded.test.py b/tests/gold_tests/headers/forwarded.test.py
index 706ffd9bb4..8add15e404 100644
--- a/tests/gold_tests/headers/forwarded.test.py
+++ b/tests/gold_tests/headers/forwarded.test.py
@@ -22,6 +22,7 @@ import os
Test.Summary = '''
Test FORWARDED header.
'''
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
Test.SkipUnless(
Condition.HasCurlFeature('http2'),
@@ -150,14 +151,14 @@ tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Po
# Delay on readiness of our ssl ports
tr.Processes.Default.StartBefore(Test.Processes.ts)
#
-tr.MakeCurlCommand('--verbose --ipv4 --http1.1 --proxy localhost:{} http://www.no-oride.com'.format(ts.Variables.port))
+tr.MakeCurlCommand('--verbose --ipv4 --http1.1 --proxy localhost:{} http://www.no-oride.com'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
def TestHttp1_1(host):
tr = Test.AddTestRun()
- tr.MakeCurlCommand('--verbose --ipv4 --http1.1 --proxy localhost:{} http://{}'.format(ts.Variables.port, host))
+ tr.MakeCurlCommand('--verbose --ipv4 --http1.1 --proxy localhost:{} http://{}'.format(ts.Variables.port, host), ts=ts)
tr.Processes.Default.ReturnCode = 0
@@ -200,7 +201,7 @@ tr = Test.AddTestRun()
# Delay on readiness of our ssl ports
tr.Processes.Default.StartBefore(Test.Processes.ts2)
#
-tr.MakeCurlCommand('--verbose --ipv4 --http1.1 --proxy localhost:{} http://www.no-oride.com'.format(ts2.Variables.port))
+tr.MakeCurlCommand('--verbose --ipv4 --http1.1 --proxy localhost:{} http://www.no-oride.com'.format(ts2.Variables.port), ts=ts2)
tr.Processes.Default.ReturnCode = 0
# Call traffic_ctrl to set insert_forwarded
@@ -216,41 +217,45 @@ tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
# Delay to give traffic_ctl config change time to take effect.
tr.DelayStart = 15
-tr.MakeCurlCommand('--verbose --ipv4 --http1.1 --proxy localhost:{} http://www.no-oride.com'.format(ts2.Variables.port))
+tr.MakeCurlCommand('--verbose --ipv4 --http1.1 --proxy localhost:{} http://www.no-oride.com'.format(ts2.Variables.port), ts=ts2)
tr.Processes.Default.ReturnCode = 0
# HTTP 1.0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--verbose --ipv4 --http1.0 --proxy localhost:{} http://www.no-oride.com'.format(ts2.Variables.port))
+tr.MakeCurlCommand('--verbose --ipv4 --http1.0 --proxy localhost:{} http://www.no-oride.com'.format(ts2.Variables.port), ts=ts2)
tr.Processes.Default.ReturnCode = 0
# HTTP 1.0 -- Forwarded headers already present
tr = Test.AddTestRun()
tr.MakeCurlCommand(
"--verbose -H 'forwarded:for=0.6.6.6' -H 'forwarded:for=_argh' --ipv4 --http1.0" +
- " --proxy localhost:{} http://www.no-oride.com".format(ts2.Variables.port))
+ " --proxy localhost:{} http://www.no-oride.com".format(ts2.Variables.port),
+ ts=ts2)
tr.Processes.Default.ReturnCode = 0
# HTTP 2
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'--verbose --ipv4 --http2 --insecure --header "Host: www.no-oride.com"' +
- ' https://localhost:{}'.format(ts2.Variables.ssl_port))
+ ' https://localhost:{}'.format(ts2.Variables.ssl_port),
+ ts=ts2)
tr.Processes.Default.ReturnCode = 0
# TLS
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--verbose --ipv4 --http1.1 --insecure --header "Host: www.no-oride.com" https://localhost:{}'.format(ts2.Variables.ssl_port))
+ '--verbose --ipv4 --http1.1 --insecure --header "Host: www.no-oride.com" https://localhost:{}'.format(ts2.Variables.ssl_port),
+ ts=ts2)
tr.Processes.Default.ReturnCode = 0
# IPv6
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--verbose --ipv6 --http1.1 --proxy localhost:{} http://www.no-oride.com'.format(ts2.Variables.portv6))
+tr.MakeCurlCommand('--verbose --ipv6 --http1.1 --proxy localhost:{} http://www.no-oride.com'.format(ts2.Variables.portv6), ts=ts2)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--verbose --ipv6 --http1.1 --insecure --header "Host: www.no-oride.com" https://localhost:{}'.format(ts2.Variables.ssl_portv6))
+ '--verbose --ipv6 --http1.1 --insecure --header "Host: www.no-oride.com" https://localhost:{}'.format(ts2.Variables.ssl_portv6),
+ ts=ts2)
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/headers/general-connection-failure-502.gold b/tests/gold_tests/headers/general-connection-failure-502.gold
index d0de59d257..836a41d63f 100644
--- a/tests/gold_tests/headers/general-connection-failure-502.gold
+++ b/tests/gold_tests/headers/general-connection-failure-502.gold
@@ -1,4 +1,4 @@
-HTTP/1.1 502 Connection refused
+HTTP/1.1 502 ``
Connection: keep-alive
Cache-Control: no-store
Content-Type: text/html
diff --git a/tests/gold_tests/headers/good_request_after_bad.test.py b/tests/gold_tests/headers/good_request_after_bad.test.py
index 86d5b128af..44aeb4e285 100644
--- a/tests/gold_tests/headers/good_request_after_bad.test.py
+++ b/tests/gold_tests/headers/good_request_after_bad.test.py
@@ -123,14 +123,15 @@ tr.Processes.Default.Streams.stdout = 'gold/bad_good_request.gold'
tr = Test.AddTestRun("Trace request with a chunked body via curl")
tr.MakeCurlCommand(
'-v --http1.1 --header "Transfer-Encoding: chunked" -d aaa -X TRACE -o trace_curl.txt -k http://127.0.0.1:{}/foo'.format(
- ts.Variables.port))
+ ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = 'gold/bad_good_request_header.gold'
trace_out.Content = Testers.ContainsExpression("<TITLE>Bad Request</TITLE>", "ATS error msg")
trace_out.Content += Testers.ContainsExpression("Description: Could not process this request.", "ATS error msg")
tr = Test.AddTestRun("Trace request via curl")
-tr.MakeCurlCommand('-v --http1.1 -X TRACE -k http://127.0.0.1:{}/bar'.format(ts.Variables.port))
+tr.MakeCurlCommand('-v --http1.1 -X TRACE -k http://127.0.0.1:{}/bar'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ContainsExpression(
r"HTTP/1.1 501 Unsupported method \('TRACE'\)", "microserver does not support TRACE")
diff --git a/tests/gold_tests/headers/hsts.test.py b/tests/gold_tests/headers/hsts.test.py
index c39481f98d..e543832516 100644
--- a/tests/gold_tests/headers/hsts.test.py
+++ b/tests/gold_tests/headers/hsts.test.py
@@ -20,7 +20,7 @@ Test the hsts response header.
Test.Summary = '''
heck hsts header is set correctly
'''
-
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
Test.ContinueOnFail = True
# Define default ATS
@@ -55,7 +55,8 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.MakeCurlCommand(
'-s -D - --verbose --ipv4 --http1.1 --insecure --header "Host: {0}" https://localhost:{1}'.format(
- 'www.example.com', ts.Variables.ssl_port))
+ 'www.example.com', ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "hsts.200.gold"
tr.StillRunningAfter = ts
@@ -64,7 +65,8 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'-s -D - --verbose --ipv4 --http1.1 --insecure --header "Host: {0}" https://localhost:{1}'.format(
- 'bad_host', ts.Variables.ssl_port))
+ 'bad_host', ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "hsts.404.gold"
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/headers/normalize_ae.test.py b/tests/gold_tests/headers/normalize_ae.test.py
index ffc53735a1..313023150d 100644
--- a/tests/gold_tests/headers/normalize_ae.test.py
+++ b/tests/gold_tests/headers/normalize_ae.test.py
@@ -76,6 +76,10 @@ normalize_ae_log_id.Content = "normalize_ae.gold"
# Try various Accept-Encoding header fields for a particular traffic server and host.
+ipv4flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
+
def allAEHdrs(shouldWaitForUServer, shouldWaitForTs, ts, host):
@@ -90,34 +94,34 @@ def allAEHdrs(shouldWaitForUServer, shouldWaitForTs, ts, host):
# delay on readiness of port
tr.Processes.Default.StartBefore(ts)
- baseCurl = '--verbose --ipv4 --http1.1 --proxy localhost:{} '.format(ts.Variables.port)
+ baseCurl = '--verbose {0} --http1.1 --proxy localhost:{1} '.format(ipv4flag, ts.Variables.port)
# No Accept-Encoding header.
#
- tr.MakeCurlCommand(baseCurl + '--header "X-Au-Test: {0}" http://{0}'.format(host))
+ tr.MakeCurlCommand(baseCurl + '--header "X-Au-Test: {0}" http://{0}'.format(host), ts=ts)
tr.Processes.Default.ReturnCode = 0
def curlTail(hdrValue):
return '--header "Accept-Encoding: {}" http://'.format(hdrValue) + host
tr = test.AddTestRun()
- tr.MakeCurlCommand(baseCurl + curlTail('gzip'))
+ tr.MakeCurlCommand(baseCurl + curlTail('gzip'), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = test.AddTestRun()
- tr.MakeCurlCommand(baseCurl + curlTail('x-gzip'))
+ tr.MakeCurlCommand(baseCurl + curlTail('x-gzip'), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = test.AddTestRun()
- tr.MakeCurlCommand(baseCurl + curlTail('br'))
+ tr.MakeCurlCommand(baseCurl + curlTail('br'), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = test.AddTestRun()
- tr.MakeCurlCommand(baseCurl + curlTail('gzip, br'))
+ tr.MakeCurlCommand(baseCurl + curlTail('gzip, br'), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = test.AddTestRun()
- tr.MakeCurlCommand(baseCurl + curlTail('gzip;q=0.3, whatever;q=0.666, br;q=0.7'))
+ tr.MakeCurlCommand(baseCurl + curlTail('gzip;q=0.3, whatever;q=0.666, br;q=0.7'), ts=ts)
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/headers/range.test.py b/tests/gold_tests/headers/range.test.py
index a98f1ead09..32b94c6664 100644
--- a/tests/gold_tests/headers/range.test.py
+++ b/tests/gold_tests/headers/range.test.py
@@ -135,7 +135,7 @@ ts.Disk.records_config.update(
# ATS should ignore the Range header when given an If-Range header with the incorrect etag
tr = Test.AddTestRun()
-tr.MakeCurlCommand(curl_range(ts, ifrange='"should-not-match"'))
+tr.MakeCurlCommand(curl_range(ts, ifrange='"should-not-match"'), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(microserver, ready=When.PortOpen(microserver.Variables.Port))
tr.Processes.Default.StartBefore(origin, ready=When.PortOpen(origin.Variables.port))
@@ -147,66 +147,66 @@ tr.Processes.Default.Streams.stdout = "gold/range-200.gold"
# ATS should respond to Range requests with partial content
tr = Test.AddTestRun()
-tr.MakeCurlCommand(curl_range(ts))
+tr.MakeCurlCommand(curl_range(ts), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/range-206.gold"
# ATS should respond to Range requests with partial content when given an If-Range header with
# the correct etag
tr = Test.AddTestRun()
-tr.MakeCurlCommand(curl_range(ts, ifrange='"range"'))
+tr.MakeCurlCommand(curl_range(ts, ifrange='"range"'), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/range-206.gold"
# ATS should respond to Range requests with partial content when given an If-Range header
# that matches the Last-Modified header of the cached response
tr = Test.AddTestRun()
-tr.MakeCurlCommand(curl_range(ts, ifrange="Thu, 10 Feb 2022 00:00:00 GMT"))
+tr.MakeCurlCommand(curl_range(ts, ifrange="Thu, 10 Feb 2022 00:00:00 GMT"), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/range-206.gold"
# ATS should respond to Range requests with the full content when given an If-Range header
# that doesn't match the Last-Modified header of the cached response
tr = Test.AddTestRun()
-tr.MakeCurlCommand(curl_range(ts, ifrange="Thu, 10 Feb 2022 01:00:00 GMT"))
+tr.MakeCurlCommand(curl_range(ts, ifrange="Thu, 10 Feb 2022 01:00:00 GMT"), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/range-200.gold"
# ATS should respond to Range requests with a 416 error code when the given Range is invalid
tr = Test.AddTestRun()
-tr.MakeCurlCommand(curl_range(ts, start=100, end=105))
+tr.MakeCurlCommand(curl_range(ts, start=100, end=105), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/range-416.gold"
# ATS should ignore the Range header when given an If-Range header with the incorrect etag
tr = Test.AddTestRun()
-tr.MakeCurlCommand(curl_range(ts, ifrange='"should-not-match"'))
+tr.MakeCurlCommand(curl_range(ts, ifrange='"should-not-match"'), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/range-200.gold"
# ATS should ignore the Range header when given an If-Range header with weak etags
tr = Test.AddTestRun()
-tr.MakeCurlCommand(curl_range(ts, ifrange='W/"range"'))
+tr.MakeCurlCommand(curl_range(ts, ifrange='W/"range"'), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/range-200.gold"
# ATS should ignore the Range header when given an If-Range header with a date older than the
# Last-Modified header of the cached response
tr = Test.AddTestRun()
-tr.MakeCurlCommand(curl_range(ts, ifrange="Wed, 09 Feb 2022 23:00:00 GMT"))
+tr.MakeCurlCommand(curl_range(ts, ifrange="Wed, 09 Feb 2022 23:00:00 GMT"), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/range-200.gold"
# Write to the cache by requesting the entire content
tr = Test.AddTestRun()
-tr.MakeCurlCommand(curl_whole(ts, path="short"))
+tr.MakeCurlCommand(curl_whole(ts, path="short"), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/range-200.gold"
# ATS should respond to range requests with partial content for stale caches in response to
# valid If-Range requests if the origin responds with 304 Not Modified.
tr = Test.AddTestRun()
-tr.MakeCurlCommandMulti(f"sleep {2 * CACHE_SHORT_MAXAGE}; {{curl}} " + curl_range(ts, path="short", ifrange='"range"'))
+tr.MakeCurlCommandMulti(f"sleep {2 * CACHE_SHORT_MAXAGE}; {{curl}} " + curl_range(ts, path="short", ifrange='"range"'), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/range-206-revalidated.gold"
diff --git a/tests/gold_tests/headers/syntax.test.py b/tests/gold_tests/headers/syntax.test.py
index a906c3777f..00d30cb260 100644
--- a/tests/gold_tests/headers/syntax.test.py
+++ b/tests/gold_tests/headers/syntax.test.py
@@ -35,12 +35,17 @@ server.addResponse("sessionlog.json", request_header, response_header)
ts.Disk.remap_config.AddLine('map http://www.example.com http://127.0.0.1:{0}'.format(server.Variables.Port))
+ipv4flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
+
# Test 0 - 200 Response
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -H " foo: bar" -H "Host: www.example.com" http://localhost:{0}/'.format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -H " foo: bar" -H "Host: www.example.com" http://localhost:{1}/'.format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "syntax.200.gold"
tr.StillRunningAfter = ts
@@ -48,7 +53,8 @@ tr.StillRunningAfter = ts
# Test 1 - 400 Response - Single space after field name
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -H "foo : bar" -H "Host: www.example.com" http://localhost:{0}/'.format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -H "foo : bar" -H "Host: www.example.com" http://localhost:{1}/'.format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "syntax.400.gold"
tr.StillRunningAfter = ts
@@ -56,7 +62,8 @@ tr.StillRunningAfter = ts
# Test 2 - 400 Response - Double space after field name
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -H "foo : bar" -H "Host: www.example.com" http://localhost:{0}/'.format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -H "foo : bar" -H "Host: www.example.com" http://localhost:{1}/'.format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "syntax.400.gold"
tr.StillRunningAfter = ts
@@ -64,8 +71,9 @@ tr.StillRunningAfter = ts
# Test 3 - 400 Response - Three different Content-Length headers
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -d "hello world" -H "Content-Length: 11" -H "Content-Length: 10" -H "Content-Length: 9" -H "Host: www.example.com" http://localhost:{0}/'
- .format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -d "hello world" -H "Content-Length: 11" -H "Content-Length: 10" -H "Content-Length: 9" -H "Host: www.example.com" http://localhost:{1}/'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "syntax.400.gold"
tr.StillRunningAfter = ts
@@ -73,8 +81,9 @@ tr.StillRunningAfter = ts
# Test 4 - 200 Response - Three same Content-Length headers
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -d "hello world" -H "Content-Length: 11" -H "Content-Length: 11" -H "Content-Length: 11" -H "Host: www.example.com" http://localhost:{0}/'
- .format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -d "hello world" -H "Content-Length: 11" -H "Content-Length: 11" -H "Content-Length: 11" -H "Host: www.example.com" http://localhost:{1}/'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "syntax.200.gold"
tr.StillRunningAfter = ts
@@ -82,8 +91,9 @@ tr.StillRunningAfter = ts
# Test 5 - 200 Response - Three different Content-Length headers with a Transfer encoding header
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '-s -D - -v --ipv4 --http1.1 -d "hello world" -H "Transfer-Encoding: chunked" -H "Content-Length: 11" -H "Content-Length: 10" -H "Content-Length: 9" -H "Host: www.example.com" http://localhost:{0}/'
- .format(ts.Variables.port))
+ '-s -D - -v {0} --http1.1 -d "hello world" -H "Transfer-Encoding: chunked" -H "Content-Length: 11" -H "Content-Length: 10" -H "Content-Length: 9" -H "Host: www.example.com" http://localhost:{1}/'
+ .format(ipv4flag, ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "syntax.200.gold"
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/headers/via.test.py b/tests/gold_tests/headers/via.test.py
index 4f1562abaf..3ab495a2e6 100644
--- a/tests/gold_tests/headers/via.test.py
+++ b/tests/gold_tests/headers/via.test.py
@@ -63,9 +63,17 @@ ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key
via_log_id = Test.Disk.File("via.log")
if Condition.HasATSFeature('TS_USE_QUIC') and Condition.HasCurlFeature('http3'):
via_log_id.Content = "via_h3.gold"
+elif Condition.CurlUsingUnixDomainSocket():
+ via_log_id.Content = "via_uds.gold"
else:
via_log_id.Content = "via.gold"
+ipv4flag = ""
+ipv6flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
+ ipv6flag = "--ipv6"
+
# Basic HTTP 1.1
tr = Test.AddTestRun()
# Wait for the micro server
@@ -73,7 +81,8 @@ tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Po
# Delay on readiness of our ssl ports
tr.Processes.Default.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand('--verbose --ipv4 --http1.1 --proxy localhost:{} http://www.example.com'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '--verbose {0} --http1.1 --proxy localhost:{1} http://www.example.com'.format(ipv4flag, ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = server
@@ -81,50 +90,60 @@ tr.StillRunningAfter = ts
# HTTP 1.0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--verbose --ipv4 --http1.0 --proxy localhost:{} http://www.example.com'.format(ts.Variables.port))
-tr.Processes.Default.ReturnCode = 0
-
-tr.StillRunningAfter = server
-tr.StillRunningAfter = ts
-
-# HTTP 2
-tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--verbose --ipv4 --http2 --insecure --header "Host: www.example.com" https://localhost:{}'.format(ts.Variables.ssl_port))
+ '--verbose {0} --http1.0 --proxy localhost:{1} http://www.example.com'.format(ipv4flag, ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-# HTTP 3
-if Condition.HasATSFeature('TS_HAS_QUICHE') and Condition.HasCurlFeature('http3'):
+if not Condition.CurlUsingUnixDomainSocket():
+ # HTTP 2
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--verbose --ipv4 --http3 --insecure --header "Host: www.example.com" https://localhost:{}'.format(ts.Variables.ssl_port))
+ '--verbose --ipv4 --http2 --insecure --header "Host: www.example.com" https://localhost:{}'.format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
+
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-# TLS
-tr = Test.AddTestRun()
-tr.MakeCurlCommand(
- '--verbose --ipv4 --http1.1 --insecure --header "Host: www.example.com" https://localhost:{}'.format(ts.Variables.ssl_port))
-tr.Processes.Default.ReturnCode = 0
+ # HTTP 3
+ if Condition.HasATSFeature('TS_HAS_QUICHE') and Condition.HasCurlFeature('http3'):
+ tr = Test.AddTestRun()
+ tr.MakeCurlCommand(
+ '--verbose --ipv4 --http3 --insecure --header "Host: www.example.com" https://localhost:{}'.format(
+ ts.Variables.ssl_port),
+ ts=ts)
+ tr.Processes.Default.ReturnCode = 0
+ tr.StillRunningAfter = server
+ tr.StillRunningAfter = ts
+
+ # TLS
+ tr = Test.AddTestRun()
+ tr.MakeCurlCommand(
+ '--verbose --ipv4 --http1.1 --insecure --header "Host: www.example.com" https://localhost:{}'.format(ts.Variables.ssl_port),
+ ts=ts)
+ tr.Processes.Default.ReturnCode = 0
-tr.StillRunningAfter = server
-tr.StillRunningAfter = ts
+ tr.StillRunningAfter = server
+ tr.StillRunningAfter = ts
# IPv6
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--verbose --ipv6 --http1.1 --proxy localhost:{} http://www.example.com'.format(ts.Variables.portv6))
+tr.MakeCurlCommand(
+ '--verbose {0} --http1.1 --proxy localhost:{1} http://www.example.com'.format(ipv6flag, ts.Variables.portv6), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
-tr = Test.AddTestRun()
-tr.MakeCurlCommand(
- '--verbose --ipv6 --http1.1 --insecure --header "Host: www.example.com" https://localhost:{}'.format(ts.Variables.ssl_portv6))
-tr.Processes.Default.ReturnCode = 0
+if not Condition.CurlUsingUnixDomainSocket():
+ tr = Test.AddTestRun()
+ tr.MakeCurlCommand(
+ '--verbose --ipv6 --http1.1 --insecure --header "Host: www.example.com" https://localhost:{}'.format(
+ ts.Variables.ssl_portv6),
+ ts=ts)
+ tr.Processes.Default.ReturnCode = 0
-tr.StillRunningAfter = server
-tr.StillRunningAfter = ts
+ tr.StillRunningAfter = server
+ tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/headers/via_uds.gold b/tests/gold_tests/headers/via_uds.gold
new file mode 100644
index 0000000000..8b16c0e6b1
--- /dev/null
+++ b/tests/gold_tests/headers/via_uds.gold
@@ -0,0 +1,3 @@
+Via: http/1.1 = http/1.1 tcp
+Via: http/1.0 = http/1.0 tcp
+Via: http/1.1 = http/1.1 tcp
diff --git a/tests/gold_tests/ip_allow/ip_allow.test.py b/tests/gold_tests/ip_allow/ip_allow.test.py
index fcf3e4d4b2..c6e7c7c4fe 100644
--- a/tests/gold_tests/ip_allow/ip_allow.test.py
+++ b/tests/gold_tests/ip_allow/ip_allow.test.py
@@ -22,7 +22,7 @@ import os
Test.Summary = '''
Verify ip_allow filtering behavior.
'''
-
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
Test.ContinueOnFail = True
# Define default ATS
@@ -141,7 +141,7 @@ tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.SSL_Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand('--verbose -H "Host: www.example.com" http://localhost:{ts_port}/get'.format(ts_port=ts.Variables.port))
+tr.MakeCurlCommand('--verbose -H "Host: www.example.com" http://localhost:{ts_port}/get'.format(ts_port=ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = 'gold/200.gold'
tr.StillRunningAfter = ts
@@ -152,7 +152,8 @@ tr.StillRunningAfter = server
# not in the allowlist.
#
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--verbose -X CONNECT -H "Host: localhost" http://localhost:{ts_port}/connect'.format(ts_port=ts.Variables.port))
+tr.MakeCurlCommand(
+ '--verbose -X CONNECT -H "Host: localhost" http://localhost:{ts_port}/connect'.format(ts_port=ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = 'gold/403.gold'
tr.StillRunningAfter = ts
@@ -164,7 +165,8 @@ tr.StillRunningAfter = server
#
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--http2 --verbose -k -X PUSH -H "Host: localhost" https://localhost:{ts_port}/h2_push'.format(ts_port=ts.Variables.ssl_port))
+ '--http2 --verbose -k -X PUSH -H "Host: localhost" https://localhost:{ts_port}/h2_push'.format(ts_port=ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = 'gold/403_h2.gold'
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/ip_allow/ip_allow.test.py b/tests/gold_tests/ip_allow/ip_allow_pp_uds.test.py
similarity index 74%
copy from tests/gold_tests/ip_allow/ip_allow.test.py
copy to tests/gold_tests/ip_allow/ip_allow_pp_uds.test.py
index fcf3e4d4b2..9bea8b10c9 100644
--- a/tests/gold_tests/ip_allow/ip_allow.test.py
+++ b/tests/gold_tests/ip_allow/ip_allow_pp_uds.test.py
@@ -22,7 +22,7 @@ import os
Test.Summary = '''
Verify ip_allow filtering behavior.
'''
-
+Test.SkipUnless(Condition.CurlUsingUnixDomainSocket())
Test.ContinueOnFail = True
# Define default ATS
@@ -134,63 +134,6 @@ ts.Disk.traffic_out.Content += Testers.ContainsExpression(
ts.Disk.traffic_out.Content += Testers.ContainsExpression(
"Line 1 denial for 'PUSH' from 127.0.0.1", "The PUSH request should be denied by ip_allow")
-#
-# TEST 1: Perform a GET request. Should be allowed because GET is in the allowlist.
-#
-tr = Test.AddTestRun()
-tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.SSL_Port))
-tr.Processes.Default.StartBefore(Test.Processes.ts)
-
-tr.MakeCurlCommand('--verbose -H "Host: www.example.com" http://localhost:{ts_port}/get'.format(ts_port=ts.Variables.port))
-tr.Processes.Default.ReturnCode = 0
-tr.Processes.Default.Streams.stderr = 'gold/200.gold'
-tr.StillRunningAfter = ts
-tr.StillRunningAfter = server
-
-#
-# TEST 2: Perform a CONNECT request. Should not be allowed because CONNECT is
-# not in the allowlist.
-#
-tr = Test.AddTestRun()
-tr.MakeCurlCommand('--verbose -X CONNECT -H "Host: localhost" http://localhost:{ts_port}/connect'.format(ts_port=ts.Variables.port))
-tr.Processes.Default.ReturnCode = 0
-tr.Processes.Default.Streams.stderr = 'gold/403.gold'
-tr.StillRunningAfter = ts
-tr.StillRunningAfter = server
-
-#
-# TEST 3: Perform a PUSH request over HTTP/2. Should not be allowed because
-# PUSH is not in the allowlist.
-#
-tr = Test.AddTestRun()
-tr.MakeCurlCommand(
- '--http2 --verbose -k -X PUSH -H "Host: localhost" https://localhost:{ts_port}/h2_push'.format(ts_port=ts.Variables.ssl_port))
-tr.Processes.Default.ReturnCode = 0
-tr.Processes.Default.Streams.stderr = 'gold/403_h2.gold'
-tr.StillRunningAfter = ts
-tr.StillRunningAfter = server
-
-tr = Test.AddTestRun()
-tr.Processes.Default.Command = (
- os.path.join(Test.Variables.AtsTestToolsDir, 'stdout_wait') + ' 60 "{} {}" {}'.format(
- os.path.join(Test.TestDirectory, 'run_sed.sh'), os.path.join(ts.Variables.LOGDIR, 'squid.log'),
- os.path.join(Test.TestDirectory, 'gold/log.gold')))
-tr.Processes.Default.ReturnCode = 0
-
-IP_ALLOW_CONFIG_ALLOW_ALL = '''ip_allow:
- - apply: in
- ip_addrs: 0/0
- action: allow
- methods: ALL
-'''
-
-IP_ALLOW_CONFIG_DENY_ALL = '''ip_allow:
- - apply: in
- ip_addrs: 0/0
- action: deny
- methods: ALL
-'''
-
class Test_ip_allow:
"""Configure a test to verify ip_allow behavior."""
@@ -250,14 +193,13 @@ class Test_ip_allow:
self._ts.Disk.records_config.update(
{
'proxy.config.diags.debug.enabled': 1,
- 'proxy.config.diags.debug.tags': 'v_quic|quic|http|ip_allow|proxyprotocol',
+ 'proxy.config.diags.debug.tags': 'v_quic|quic|http|proxyprotocol|ip_allow',
'proxy.config.http.push_method_enabled': 1,
'proxy.config.ssl.server.cert.path': '{0}'.format(ts.Variables.SSLDir),
'proxy.config.quic.no_activity_timeout_in': 0,
'proxy.config.ssl.server.private_key.path': '{0}'.format(ts.Variables.SSLDir),
'proxy.config.ssl.client.verify.server.policy': 'PERMISSIVE',
'proxy.config.http.connect_ports': f"{self._server.Variables.http_port}",
- 'proxy.config.acl.subjects': 'PROXY,PEER',
})
self._ts.Disk.remap_config.AddLine(f'map / http://127.0.0.1:{self._server.Variables.http_port}')
@@ -299,42 +241,7 @@ class Test_ip_allow:
tr.Processes.Default.Streams.all = self.gold_file
-# ip_allow tests for h3.
-if Condition.HasATSFeature('TS_USE_QUIC') and Condition.HasCurlFeature('http3'):
-
- # TEST 4: Perform a request in h3 with ip_allow configured to allow all IPs.
- test0 = Test_ip_allow(
- "h3_allow_all",
- replay_file='replays/h3.replay.yaml',
- ip_allow_config=IP_ALLOW_CONFIG_ALLOW_ALL,
- is_h3=True,
- expect_request_rejected=False)
- test0.run()
-
- # TEST 5: Perform a request in h3 with ip_allow configured to deny all IPs.
- test1 = Test_ip_allow(
- "h3_deny_all",
- replay_file='replays/h3.replay.yaml',
- ip_allow_config=IP_ALLOW_CONFIG_DENY_ALL,
- is_h3=True,
- expect_request_rejected=True)
- test1.run()
-
-# TEST 6: Verify rules are applied to all methods if methods is not specified.
-IP_ALLOW_CONFIG_METHODS_UNSPECIFIED = '''ip_allow:
- - apply: in
- ip_addrs: 0/0
- action: allow
-'''
-test_ip_allow_optional_methods = Test_ip_allow(
- "ip_allow_optional_methods",
- replay_file='replays/https_multiple_methods.replay.yaml',
- ip_allow_config=IP_ALLOW_CONFIG_METHODS_UNSPECIFIED,
- is_h3=False,
- expect_request_rejected=False)
-test_ip_allow_optional_methods.run()
-
-# TEST 7: Verify IP address from PROXY protocol is used.
+# TEST 1: Verify IP address from PROXY protocol is used.
IP_ALLOW_CONFIG_PROXY_PROTOCOL = '''ip_allow:
- apply: in
ip_addrs: 1.2.3.4
diff --git a/tests/gold_tests/logging/all_headers.test.py b/tests/gold_tests/logging/all_headers.test.py
index 8c29548ec9..d6f6fff74f 100644
--- a/tests/gold_tests/logging/all_headers.test.py
+++ b/tests/gold_tests/logging/all_headers.test.py
@@ -25,7 +25,7 @@ Test new "all headers" log fields
# Define ATS.
#
-ts = Test.MakeATSProcess("ts")
+ts = Test.MakeATSProcess("ts", enable_proxy_protocol=True)
# Define MicroServer.
#
@@ -39,10 +39,18 @@ response_header = {
}
server.addResponse("sessionlog.json", request_header, response_header)
-ts.Disk.records_config.update({
- 'proxy.config.diags.debug.enabled': 0,
- 'proxy.config.diags.debug.tags': 'http|dns',
-})
+if Condition.CurlUsingUnixDomainSocket():
+ ts.Disk.records_config.update(
+ {
+ 'proxy.config.diags.debug.enabled': 0,
+ 'proxy.config.diags.debug.tags': 'http|dns',
+ 'proxy.config.http.insert_forwarded': 'for',
+ })
+else:
+ ts.Disk.records_config.update({
+ 'proxy.config.diags.debug.enabled': 0,
+ 'proxy.config.diags.debug.tags': 'http|dns',
+ })
ts.Disk.remap_config.AddLine('map http://127.0.0.1:{0} http://127.0.0.1:{1}'.format(ts.Variables.port, server.Variables.Port))
@@ -62,7 +70,10 @@ logging:
# Configure comparison of "sanitized" log file with gold file at end of test.
#
sanitized_log_path = os.path.join(ts.Variables.LOGDIR, 'test_all_headers.log.san')
-Test.Disk.File(sanitized_log_path, exists=True, content='gold/test_all_headers.gold')
+if Condition.CurlUsingUnixDomainSocket():
+ Test.Disk.File(sanitized_log_path, exists=True, content='gold/test_all_headers_uds.gold')
+else:
+ Test.Disk.File(sanitized_log_path, exists=True, content='gold/test_all_headers.gold')
def reallyLong():
@@ -79,13 +90,25 @@ def reallyLong():
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand('"http://127.0.0.1:{0}" --user-agent "007" --verbose '.format(ts.Variables.port) + reallyLong())
+if Condition.CurlUsingUnixDomainSocket():
+ tr.MakeCurlCommand(
+ '"http://127.0.0.1:{0}" --user-agent "007" --haproxy-protocol 1 --haproxy-clientip 127.0.0.1 --verbose '.format(
+ ts.Variables.port) + reallyLong(),
+ ts=ts)
+else:
+ tr.MakeCurlCommand('"http://127.0.0.1:{0}" --user-agent "007" --verbose '.format(ts.Variables.port) + reallyLong(), ts=ts)
tr.Processes.Default.ReturnCode = 0
# Repeat same curl, will be answered from the ATS cache.
#
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.0.0.1:{0}" --user-agent "007" --verbose '.format(ts.Variables.port) + reallyLong())
+if Condition.CurlUsingUnixDomainSocket():
+ tr.MakeCurlCommand(
+ '"http://127.0.0.1:{0}" --user-agent "007" --haproxy-protocol 1 --haproxy-clientip 127.0.0.1 --verbose '.format(
+ ts.Variables.port) + reallyLong(),
+ ts=ts)
+else:
+ tr.MakeCurlCommand('"http://127.0.0.1:{0}" --user-agent "007" --verbose '.format(ts.Variables.port) + reallyLong(), ts=ts)
tr.Processes.Default.ReturnCode = 0
# Delay to allow TS to flush report to disk, then "sanitize" generated log.
diff --git a/tests/gold_tests/logging/custom-log.test.py b/tests/gold_tests/logging/custom-log-pp-uds.test.py
similarity index 64%
copy from tests/gold_tests/logging/custom-log.test.py
copy to tests/gold_tests/logging/custom-log-pp-uds.test.py
index 159b444394..374d83b529 100644
--- a/tests/gold_tests/logging/custom-log.test.py
+++ b/tests/gold_tests/logging/custom-log-pp-uds.test.py
@@ -23,10 +23,10 @@ Test custom log file format
'''
# this test depends on Linux specific behavior regarding loopback addresses
-Test.SkipUnless(Condition.IsPlatform("linux"))
+Test.SkipUnless(Condition.IsPlatform("linux"), Condition.CurlUsingUnixDomainSocket())
# Define default ATS
-ts = Test.MakeATSProcess("ts")
+ts = Test.MakeATSProcess("ts", enable_proxy_protocol=True)
# setup some config file for this server
ts.Disk.remap_config.AddLine('map / http://www.linkedin.com/ @action=deny')
@@ -36,7 +36,7 @@ ts.Disk.logging_yaml.AddLines(
logging:
formats:
- name: custom
- format: "%<hii> %<hiih>"
+ format: "%<pps>"
logs:
- filename: test_log_field
format: custom
@@ -46,40 +46,49 @@ logging:
# at the end of the different test run a custom log file should exist
# Because of this we expect the testruns to pass the real test is if the
# customlog file exists and passes the format check
-Test.Disk.File(os.path.join(ts.Variables.LOGDIR, 'test_log_field.log'), exists=True, content='gold/custom.gold')
+Test.Disk.File(os.path.join(ts.Variables.LOGDIR, 'test_log_field.log'), exists=True, content='gold/custom_uds.gold')
# first test is a miss for default
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.0.0.1:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '"http://127.0.0.1:{0}" --verbose --haproxy-protocol 1 --haproxy-clientip 127.0.0.1'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.1.1.1:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '"http://127.1.1.1:{0}" --verbose --haproxy-protocol 1 --haproxy-clientip 127.1.1.1'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.2.2.2:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '"http://127.2.2.2:{0}" --verbose --haproxy-protocol 1 --haproxy-clientip 127.2.2.2'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.3.3.3:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '"http://127.3.3.3:{0}" --verbose --haproxy-protocol 1 --haproxy-clientip 127.3.3.3'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.3.0.1:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '"http://127.3.0.1:{0}" --verbose --haproxy-protocol 1 --haproxy-clientip 127.3.0.1'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.43.2.1:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '"http://127.43.2.1:{0}" --verbose --haproxy-protocol 1 --haproxy-clientip 127.43.2.1'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.213.213.132:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '"http://127.213.213.132:{0}" --verbose --haproxy-protocol 1 --haproxy-clientip 127.213.213.132'.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.123.32.243:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '"http://127.123.32.243:{0}" --verbose --haproxy-protocol 1 --haproxy-clientip 127.123.32.243'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
# Wait for log file to appear, then wait one extra second to make sure TS is done writing it.
diff --git a/tests/gold_tests/logging/custom-log.test.py b/tests/gold_tests/logging/custom-log.test.py
index 159b444394..58c036f9b3 100644
--- a/tests/gold_tests/logging/custom-log.test.py
+++ b/tests/gold_tests/logging/custom-log.test.py
@@ -22,6 +22,7 @@ Test.Summary = '''
Test custom log file format
'''
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
# this test depends on Linux specific behavior regarding loopback addresses
Test.SkipUnless(Condition.IsPlatform("linux"))
@@ -50,36 +51,36 @@ Test.Disk.File(os.path.join(ts.Variables.LOGDIR, 'test_log_field.log'), exists=T
# first test is a miss for default
tr = Test.AddTestRun()
-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)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.1.1.1:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand('"http://127.1.1.1:{0}" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.2.2.2:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand('"http://127.2.2.2:{0}" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.3.3.3:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand('"http://127.3.3.3:{0}" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.3.0.1:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand('"http://127.3.0.1:{0}" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.43.2.1:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand('"http://127.43.2.1:{0}" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.213.213.132:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand('"http://127.213.213.132:{0}" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.123.32.243:{0}" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand('"http://127.123.32.243:{0}" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
# Wait for log file to appear, then wait one extra second to make sure TS is done writing it.
diff --git a/tests/gold_tests/logging/gold/custom_uds.gold b/tests/gold_tests/logging/gold/custom_uds.gold
new file mode 100644
index 0000000000..d4c9b6f9a4
--- /dev/null
+++ b/tests/gold_tests/logging/gold/custom_uds.gold
@@ -0,0 +1,8 @@
+127.0.0.1
+127.1.1.1
+127.2.2.2
+127.3.3.3
+127.3.0.1
+127.43.2.1
+127.213.213.132
+127.123.32.243
diff --git a/tests/gold_tests/logging/gold/test_all_headers_uds.gold b/tests/gold_tests/logging/gold/test_all_headers_uds.gold
new file mode 100644
index 0000000000..9f25fc147c
--- /dev/null
+++ b/tests/gold_tests/logging/gold/test_all_headers_uds.gold
@@ -0,0 +1,58 @@
+
+{{Accept}:{*/*}}
+{{Host}:{127.0.0.1__TS_PORT__}}
+{{User-Agent}:{007}}
+{{x-header0}:{abcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnop}}
+{{x-header1}:{abcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnop}}
+{{x-header2}:{abcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnop}}
+200
+
+({__AGE__}}
+({__ATS_SERVER__}}
+{{Cache-Control}:{max-age=85000}}
+{{Connection}:{keep-alive}}
+{{Content-Length}:{3}}
+({__DATE__}}
+
+{{Cache-Control}:{max-age=85000}}
+{{Connection}:{close}}
+{{Content-Length}:{3}}
+({__DATE__}}
+
+{{Accept}:{*/*}}
+{{Forwarded}:{for=127.0.0.1}}
+{{Host}:{127.0.0.1__TS_PORT__}}
+{{User-Agent}:{007}}
+({__VIA__}}
+{{x-header0}:{abcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnop}}
+{{x-header1}:{abcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnop}}
+{{x-header2}:{abcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnop}}
+
+END_TXN
+
+
+{{Accept}:{*/*}}
+{{Host}:{127.0.0.1__TS_PORT__}}
+{{User-Agent}:{007}}
+{{x-header0}:{abcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnop}}
+{{x-header1}:{abcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnop}}
+{{x-header2}:{abcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnopabcdefghijklmnop}}
+200
+
+({__AGE__}}
+({__ATS_SERVER__}}
+{{Cache-Control}:{max-age=85000}}
+{{Connection}:{keep-alive}}
+{{Content-Length}:{3}}
+({__DATE__}}
+
+
+
+({__AGE__}}
+({__ATS_SERVER__}}
+{{Cache-Control}:{max-age=85000}}
+{{Connection}:{keep-alive}}
+{{Content-Length}:{3}}
+({__DATE__}}
+END_TXN
+
diff --git a/tests/gold_tests/logging/log-field-json.test.py b/tests/gold_tests/logging/log-field-json.test.py
index db6d217cbe..5853f5b80b 100644
--- a/tests/gold_tests/logging/log-field-json.test.py
+++ b/tests/gold_tests/logging/log-field-json.test.py
@@ -93,22 +93,22 @@ tr.Processes.Default.StartBefore(nameserver)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.MakeCurlCommand(
- '--verbose --header "Host: test-1" --header "Foo: ab\td/ef" http://localhost:{0}/test-1'.format(ts.Variables.port))
+ '--verbose --header "Host: test-1" --header "Foo: ab\td/ef" http://localhost:{0}/test-1'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--verbose --header "Host: test-2" --header "Foo: ab\x1fd/ef" http://localhost:{0}/test-2'.format(ts.Variables.port))
+ '--verbose --header "Host: test-2" --header "Foo: ab\x1fd/ef" http://localhost:{0}/test-2'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--verbose --header "Host: test-3" --header "Foo: abc\x7fde" http://localhost:{0}/test-3'.format(ts.Variables.port))
+ '--verbose --header "Host: test-3" --header "Foo: abc\x7fde" http://localhost:{0}/test-3'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--verbose --header "Host: test-2" --header "Foo: ab\x80d/ef" http://localhost:{0}/test-4'.format(ts.Variables.port))
+ '--verbose --header "Host: test-2" --header "Foo: ab\x80d/ef" http://localhost:{0}/test-4'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
# Wait for log file to appear, then wait one extra second to make sure TS is done writing it.
diff --git a/tests/gold_tests/logging/log-field.test.py b/tests/gold_tests/logging/log-field.test.py
index 211c479d3c..44ce30c890 100644
--- a/tests/gold_tests/logging/log-field.test.py
+++ b/tests/gold_tests/logging/log-field.test.py
@@ -91,15 +91,15 @@ tr.Processes.Default.StartBefore(nameserver)
# Delay on readiness of our ssl ports
tr.Processes.Default.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand('--verbose --header "Host: test-1" http://localhost:{0}/test-1'.format(ts.Variables.port))
+tr.MakeCurlCommand('--verbose --header "Host: test-1" http://localhost:{0}/test-1'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--verbose --header "Host: test-2" http://localhost:{0}/test-2'.format(ts.Variables.port))
+tr.MakeCurlCommand('--verbose --header "Host: test-2" http://localhost:{0}/test-2'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--verbose --header "Host: test-3" http://localhost:{0}/test-3'.format(ts.Variables.port))
+tr.MakeCurlCommand('--verbose --header "Host: test-3" http://localhost:{0}/test-3'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
# Wait for log file to appear, then wait one extra second to make sure TS is done writing it.
diff --git a/tests/gold_tests/logging/log-filenames.test.py b/tests/gold_tests/logging/log-filenames.test.py
index 35b518a2ac..a4fdbc73b3 100644
--- a/tests/gold_tests/logging/log-filenames.test.py
+++ b/tests/gold_tests/logging/log-filenames.test.py
@@ -120,7 +120,8 @@ class LogFilenamesTest:
tr = Test.AddTestRun(f'Run traffic for: {description}')
tr.MakeCurlCommand(
f'http://127.0.0.1:{self.ts.Variables.port}/some/path --verbose --next '
- f'http://127.0.0.1:{self.ts.Variables.port}/server/down --verbose')
+ f'http://127.0.0.1:{self.ts.Variables.port}/server/down --verbose',
+ ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(self.ts)
diff --git a/tests/gold_tests/logging/log_retention.test.py b/tests/gold_tests/logging/log_retention.test.py
index 12c10d9bf2..1ac46931bd 100644
--- a/tests/gold_tests/logging/log_retention.test.py
+++ b/tests/gold_tests/logging/log_retention.test.py
@@ -65,7 +65,7 @@ class TestLogRetention:
the caller doesn't have to.
"""
tr = Test.AddTestRun("Initialize processes for ts{}".format(TestLogRetention.__ts_counter - 1))
- tr.MakeCurlCommand(self.get_curl_command())
+ tr.MakeCurlCommand(self.get_curl_command(), ts=self.ts)
tr.Processes.Default.ReturnCode = 0
if not TestLogRetention.__server_is_started:
self.server.StartBefore(self.ts)
@@ -189,7 +189,7 @@ test.ts.Disk.traffic_out.Content += Testers.ContainsExpression(
f"The rolled logfile.*test_deletion.log_{specified_hostname}.*was auto-deleted.*bytes were reclaimed",
"Verify that space was reclaimed")
-test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_once())
+test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_once(), ts=test.ts)
test.tr.Processes.Default.ReturnCode = 0
test.tr.StillRunningAfter = test.ts
@@ -231,7 +231,7 @@ test.ts.Disk.traffic_out.Content += Testers.ContainsExpression(
f"The rolled logfile.*test_deletion.log_{specified_hostname}.*was auto-deleted.*bytes were reclaimed",
"Verify that space was reclaimed")
-test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_once())
+test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_once(), ts=test.ts)
test.tr.Processes.Default.ReturnCode = 0
test.tr.StillRunningAfter = test.ts
test.tr.StillRunningAfter = test.server
@@ -258,7 +258,7 @@ test.ts.Disk.traffic_out.Content += Testers.ContainsExpression(
test.ts.Disk.traffic_out.Content += Testers.ContainsExpression(
"The rolled logfile.*test_log_interface.log_.*was auto-deleted.*bytes were reclaimed", "Verify that space was reclaimed")
-test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_once())
+test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_once(), ts=test.ts)
test.tr.Processes.Default.ReturnCode = 0
test.tr.StillRunningAfter = test.ts
test.tr.StillRunningAfter = test.server
@@ -319,7 +319,7 @@ test.ts.Disk.traffic_out.Content += Testers.ContainsExpression(
f"The rolled logfile.*test_high_priority_deletion.log_{hostname}.*was auto-deleted.*bytes were reclaimed",
"Verify that space was reclaimed from test_high_priority_deletion")
-test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_once())
+test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_once(), ts=test.ts)
test.tr.Processes.Default.ReturnCode = 0
test.tr.StillRunningAfter = test.ts
test.tr.StillRunningAfter = test.server
@@ -351,7 +351,7 @@ test.ts.Disk.traffic_out.Content += Testers.ExcludesExpression(
# This test doesn't require a log rotation. We just verify that the logs communicate
# the appropriate min_count values above.
-test.tr.MakeCurlCommand(test.get_curl_command())
+test.tr.MakeCurlCommand(test.get_curl_command(), ts=test.ts)
test.tr.Processes.Default.ReturnCode = 0
test.tr.StillRunningAfter = test.ts
test.tr.StillRunningAfter = test.server
@@ -398,7 +398,7 @@ test.ts.Disk.traffic_out.Content += Testers.ExcludesExpression(
test.ts.Disk.traffic_out.Content += Testers.ExcludesExpression(
"The rolled logfile.*test_deletion.log_.*was auto-deleted.*bytes were reclaimed", "Verify that space was reclaimed")
-test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_once())
+test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_once(), ts=test.ts)
test.tr.Processes.Default.ReturnCode = 0
test.tr.StillRunningAfter = test.ts
test.tr.StillRunningAfter = test.server
@@ -435,7 +435,7 @@ logging:
test.ts.Disk.traffic_out.Content = Testers.ContainsExpression(
"rolled logfile.*test_deletion.log.*old.* was auto-deleted", "Verify test_deletion.log was trimmed")
-test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_thrice())
+test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_thrice(), ts=test.ts)
test.tr.Processes.Default.ReturnCode = 0
test.tr.StillRunningAfter = test.ts
test.tr.StillRunningAfter = test.server
@@ -488,7 +488,7 @@ tr.StillRunningAfter = test.ts
tr.StillRunningAfter = test.server
tr = Test.AddTestRun("Get the log to rotate.")
-test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_once())
+test.tr.MakeCurlCommandMulti(test.get_command_to_rotate_once(), ts=test.ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = test.ts
tr.StillRunningAfter = test.server
diff --git a/tests/gold_tests/logging/new_log_flds.test.py b/tests/gold_tests/logging/new_log_flds.test.py
index 4d105b71e6..3d3ba46283 100644
--- a/tests/gold_tests/logging/new_log_flds.test.py
+++ b/tests/gold_tests/logging/new_log_flds.test.py
@@ -70,27 +70,30 @@ tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.Processes.Default.StartBefore(httpbin, ready=When.PortOpen(httpbin.Variables.Port))
#
-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)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-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)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('"http://127.0.0.1:{0}" "http://127.0.0.1:{0}" --http1.1 --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand('"http://127.0.0.1:{0}" "http://127.0.0.1:{0}" --http1.1 --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
-tr = Test.AddTestRun()
-tr.MakeCurlCommand('"https://127.0.0.1:{0}" "https://127.0.0.1:{0}" --http2 --insecure --verbose'.format(ts.Variables.ssl_port))
-tr.Processes.Default.ReturnCode = 0
-
-tr = Test.AddTestRun()
-tr.MakeCurlCommand(
- (
- '"https://reallyreallyreallyreallylong.com:{0}" --http2 --insecure --verbose' +
- ' --resolve reallyreallyreallyreallylong.com:{0}:127.0.0.1').format(ts.Variables.ssl_port))
-tr.Processes.Default.ReturnCode = 0
+if not Condition.CurlUsingUnixDomainSocket():
+ tr = Test.AddTestRun()
+ tr.MakeCurlCommand(
+ '"https://127.0.0.1:{0}" "https://127.0.0.1:{0}" --http2 --insecure --verbose'.format(ts.Variables.ssl_port), ts=ts)
+ tr.Processes.Default.ReturnCode = 0
+
+ tr = Test.AddTestRun()
+ tr.MakeCurlCommand(
+ (
+ '"https://reallyreallyreallyreallylong.com:{0}" --http2 --insecure --verbose' +
+ ' --resolve reallyreallyreallyreallylong.com:{0}:127.0.0.1').format(ts.Variables.ssl_port),
+ ts=ts)
+ tr.Processes.Default.ReturnCode = 0
# Wait for log file to appear, then wait one extra second to make sure TS is done writing it.
#
diff --git a/tests/gold_tests/logging/new_log_flds_observer.py b/tests/gold_tests/logging/new_log_flds_observer.py
index 59bd4dc195..77a9cbd3ff 100644
--- a/tests/gold_tests/logging/new_log_flds_observer.py
+++ b/tests/gold_tests/logging/new_log_flds_observer.py
@@ -47,8 +47,8 @@ for ln in csv.reader(sys.stdin, delimiter=' '):
# Validate contents of report.
#
-if (ccid[0] != ccid[1] and ccid[1] != ccid[2] and ccid[2] == ccid[3] and ctid[2] != ctid[3] and ccid[3] != ccid[4] and
- ccid[4] == ccid[5] and ctid[4] != ctid[5] and ccid[5] != ccid[6]):
+if (ccid[0] != ccid[1] and ccid[1] != ccid[2] and ccid[2] == ccid[3] and ctid[2] != ctid[3] and
+ (len(ccid) < 5 or (ccid[3] != ccid[4] and ccid[4] == ccid[5] and ctid[4] != ctid[5] and ccid[5] != ccid[6]))):
exit(code=0)
# Failure exit if report was not valid.
diff --git a/tests/gold_tests/logging/pqsi-pqsp.test.py b/tests/gold_tests/logging/pqsi-pqsp.test.py
index 2a4896e2ff..4bbc504c8d 100644
--- a/tests/gold_tests/logging/pqsi-pqsp.test.py
+++ b/tests/gold_tests/logging/pqsi-pqsp.test.py
@@ -68,12 +68,12 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(nameserver)
# Delay on readiness of our ssl ports
tr.Processes.Default.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(f'--verbose http://localhost:{ts.Variables.port}/test')
+tr.MakeCurlCommand(f'--verbose http://localhost:{ts.Variables.port}/test', ts=ts)
tr.Processes.Default.ReturnCode = 0
# Response for this duplicate request should come from cache.
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f'--verbose http://localhost:{ts.Variables.port}/test')
+tr.MakeCurlCommand(f'--verbose http://localhost:{ts.Variables.port}/test', ts=ts)
tr.Processes.Default.ReturnCode = 0
log_filespec = os.path.join(ts.Variables.LOGDIR, 'field-test.log')
diff --git a/tests/gold_tests/next_hop/parent_config/parent_config_dest_ip.test.py b/tests/gold_tests/next_hop/parent_config/parent_config_dest_ip.test.py
index d32e044710..8359ded601 100644
--- a/tests/gold_tests/next_hop/parent_config/parent_config_dest_ip.test.py
+++ b/tests/gold_tests/next_hop/parent_config/parent_config_dest_ip.test.py
@@ -119,7 +119,7 @@ curl_and_args = f"-s -D /dev/stdout -o /dev/stderr -x http://127.0.0.1:{ts0.Vari
# Request asset that goes through the layers
tr = Test.AddTestRun("request")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://foo.bar/foo.txt')
+tr.MakeCurlCommand(curl_and_args + ' http://foo.bar/foo.txt', ts=ts0)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("Via:.* ts1 .* ts0 ", "expected via header")
tr.StillRunningAfter = ts0
diff --git a/tests/gold_tests/next_hop/strategies_ch/strategies_ch.test.py b/tests/gold_tests/next_hop/strategies_ch/strategies_ch.test.py
index 509ec6392d..a20bef02ef 100644
--- a/tests/gold_tests/next_hop/strategies_ch/strategies_ch.test.py
+++ b/tests/gold_tests/next_hop/strategies_ch/strategies_ch.test.py
@@ -128,7 +128,7 @@ tr.Processes.Default.ReturnCode = 0
for i in range(num_objects):
tr = Test.AddTestRun()
- tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://dummy.com/obj{i}')
+ tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://dummy.com/obj{i}', ts=ts)
tr.Processes.Default.Streams.stdout = "body.gold"
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/next_hop/strategies_ch2/strategies_ch2.test.py b/tests/gold_tests/next_hop/strategies_ch2/strategies_ch2.test.py
index 811b406c01..7434d5a3d8 100644
--- a/tests/gold_tests/next_hop/strategies_ch2/strategies_ch2.test.py
+++ b/tests/gold_tests/next_hop/strategies_ch2/strategies_ch2.test.py
@@ -132,7 +132,7 @@ tr.Processes.Default.ReturnCode = 0
for i in range(num_objects):
tr = Test.AddTestRun()
- tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://dummy.com/obj{i}')
+ tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://dummy.com/obj{i}', ts=ts)
tr.Processes.Default.Streams.stdout = "body.gold"
tr.Processes.Default.ReturnCode = 0
@@ -144,7 +144,7 @@ tr.Processes.Default.ReturnCode = 0
for i in range(num_objects):
tr = Test.AddTestRun()
- tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://dummy.com/obj{i}')
+ tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://dummy.com/obj{i}', ts=ts)
tr.Processes.Default.Streams.stdout = "body.gold"
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/next_hop/strategies_stale/strategies_stale.test.py b/tests/gold_tests/next_hop/strategies_stale/strategies_stale.test.py
index 342c6f79e3..b5d52ea344 100644
--- a/tests/gold_tests/next_hop/strategies_stale/strategies_stale.test.py
+++ b/tests/gold_tests/next_hop/strategies_stale/strategies_stale.test.py
@@ -120,7 +120,7 @@ tr.Processes.Default.Command = 'echo start TS, HTTP server, DNS server and next
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://dummy.com/obj0')
+tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://dummy.com/obj0', ts=ts)
tr.Processes.Default.Streams.stdout = "body.gold"
tr.Processes.Default.ReturnCode = 0
@@ -131,7 +131,7 @@ tr.StillRunningAfter = ts
# Request should come back as 200
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://dummy.com/obj0')
+tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://dummy.com/obj0', ts=ts)
tr.Processes.Default.Streams.stdout = "body.gold"
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/next_hop/zzz_strategies_peer/zzz_strategies_peer.test.py b/tests/gold_tests/next_hop/zzz_strategies_peer/zzz_strategies_peer.test.py
index a7658c6696..461fd3dbad 100644
--- a/tests/gold_tests/next_hop/zzz_strategies_peer/zzz_strategies_peer.test.py
+++ b/tests/gold_tests/next_hop/zzz_strategies_peer/zzz_strategies_peer.test.py
@@ -155,14 +155,17 @@ tr.Processes.Default.ReturnCode = 0
for i in range(num_object):
tr = Test.AddTestRun()
- tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts_peer[i % num_peer].Variables.port} http://dummy.com/obj{i}')
+ tr.MakeCurlCommand(
+ f'--verbose --proxy 127.0.0.1:{ts_peer[i % num_peer].Variables.port} http://dummy.com/obj{i}', ts=ts_peer[i % num_peer])
tr.Processes.Default.Streams.stdout = "body.gold"
tr.Processes.Default.ReturnCode = 0
for i in range(num_object):
tr = Test.AddTestRun()
# num_peer must not be a multiple of 3
- tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts_peer[(i * 3) % num_peer].Variables.port} http://dummy.com/obj{i}')
+ tr.MakeCurlCommand(
+ f'--verbose --proxy 127.0.0.1:{ts_peer[(i * 3) % num_peer].Variables.port} http://dummy.com/obj{i}',
+ ts=ts_peer[(i * 3) % num_peer])
tr.Processes.Default.Streams.stdout = "body.gold"
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/next_hop/zzz_strategies_peer2/zzz_strategies_peer2.test.py b/tests/gold_tests/next_hop/zzz_strategies_peer2/zzz_strategies_peer2.test.py
index 370ae3223a..0052a8b024 100644
--- a/tests/gold_tests/next_hop/zzz_strategies_peer2/zzz_strategies_peer2.test.py
+++ b/tests/gold_tests/next_hop/zzz_strategies_peer2/zzz_strategies_peer2.test.py
@@ -143,8 +143,8 @@ tr.Processes.Default.ReturnCode = 0
for i in range(num_object):
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- f'--verbose --proxy 127.0.0.1:{ts_peer[i % num_peer].Variables.port} http://ts_upstream0:{ts_upstream[0].Variables.port}/obj{i}'
- )
+ f'--verbose --proxy 127.0.0.1:{ts_peer[i % num_peer].Variables.port} http://ts_upstream0:{ts_upstream[0].Variables.port}/obj{i}',
+ ts=ts_peer[i % num_peer])
tr.Processes.Default.Streams.stdout = "body.gold"
tr.Processes.Default.ReturnCode = 0
@@ -152,8 +152,8 @@ for i in range(num_object):
tr = Test.AddTestRun()
# num_peer must not be a multiple of 3
tr.MakeCurlCommand(
- f'--verbose --proxy 127.0.0.1:{ts_peer[(i * 3) % num_peer].Variables.port} http://ts_upstream0:{ts_upstream[0].Variables.port}/obj{i}'
- )
+ f'--verbose --proxy 127.0.0.1:{ts_peer[(i * 3) % num_peer].Variables.port} http://ts_upstream0:{ts_upstream[0].Variables.port}/obj{i}',
+ ts=ts_peer[(i * 3) % num_peer])
tr.Processes.Default.Streams.stdout = "body.gold"
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/null_transform/gold/null_transform-200.gold b/tests/gold_tests/null_transform/gold/null_transform-200.gold
index bd7333074d..2bcd41890f 100644
--- a/tests/gold_tests/null_transform/gold/null_transform-200.gold
+++ b/tests/gold_tests/null_transform/gold/null_transform-200.gold
@@ -1,5 +1,5 @@
``
-> GET http://www.example.com/ HTTP/1.1
+> GET ``/ HTTP/1.1
``
> Host: www.example.com``
``
diff --git a/tests/gold_tests/null_transform/null_transform.test.py b/tests/gold_tests/null_transform/null_transform.test.py
index 476643afde..ea1df92abe 100644
--- a/tests/gold_tests/null_transform/null_transform.test.py
+++ b/tests/gold_tests/null_transform/null_transform.test.py
@@ -53,7 +53,7 @@ Test.PrepareInstalledPlugin('null_transform.so', ts)
# www.example.com Host
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--proxy 127.0.0.1:{0} "http://www.example.com" --verbose -H "Proxy-Connection: keep-alive"'.format(ts.Variables.port))
+ '--proxy 127.0.0.1:{0} "http://www.example.com" --verbose -H "Proxy-Connection: keep-alive"'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
diff --git a/tests/gold_tests/origin_connection/per_server_connection_max.test.py b/tests/gold_tests/origin_connection/per_server_connection_max.test.py
index 2b83b9d631..0a49a0df53 100644
--- a/tests/gold_tests/origin_connection/per_server_connection_max.test.py
+++ b/tests/gold_tests/origin_connection/per_server_connection_max.test.py
@@ -18,6 +18,7 @@ Verify the behavior of proxy.config.http.per_server.connection.max.
# limitations under the License.
Test.Summary = __doc__
+import os
class PerServerConnectionMaxTest:
@@ -114,7 +115,7 @@ class ConnectMethodTest:
'proxy.config.dns.resolv_conf': 'NULL',
'proxy.config.diags.debug.enabled': 1,
'proxy.config.diags.debug.tags': 'http|dns|hostdb|conn_track',
- 'proxy.config.http.server_ports': f"{self._ts.Variables.port}",
+ 'proxy.config.http.server_ports': f"{self._ts.Variables.port} {self._ts.Variables.uds_path}",
'proxy.config.http.connect_ports': f"{self._server.Variables.Port}",
'proxy.config.http.per_server.connection.metric_enabled': 1,
'proxy.config.http.per_server.connection.max': max_conn,
@@ -128,7 +129,7 @@ class ConnectMethodTest:
"""Configure a client to perform a CONNECT request with a slow response from the server."""
p = tr.Processes.Process(f'slow_client_{ConnectMethodTest._client_counter}')
ConnectMethodTest._client_counter += 1
- tr.MakeCurlCommand(f"-v --fail -s -p -x 127.0.0.1:{self._ts.Variables.port} 'http://foo.com/delay/2'", p=p)
+ tr.MakeCurlCommand(f"-v --fail -s -p -x 127.0.0.1:{self._ts.Variables.port} 'http://foo.com/delay/2'", p=p, ts=self._ts)
return p
def _test_metrics(self, blocked) -> None:
@@ -164,7 +165,8 @@ class ConnectMethodTest:
# response.
tr.MakeCurlCommandMulti(
f"sleep 1; {{curl}} -v --fail -s -p -x 127.0.0.1:{self._ts.Variables.port} 'http://foo.com/get'"
- f"--next -v --fail -s -p -x 127.0.0.1:{self._ts.Variables.port} 'http://foo.com/get'")
+ f"--next -v --fail -s -p -x 127.0.0.1:{self._ts.Variables.port} 'http://foo.com/get'",
+ ts=self._ts)
# Curl will have a 22 exit code if it receives a 5XX response (and we
# expect a 503).
tr.Processes.Default.ReturnCode = 22 if blocked else 0
diff --git a/tests/gold_tests/parent_proxy/parent-retry.test.py b/tests/gold_tests/parent_proxy/parent-retry.test.py
index 53201002db..c5b582b1a2 100644
--- a/tests/gold_tests/parent_proxy/parent-retry.test.py
+++ b/tests/gold_tests/parent_proxy/parent-retry.test.py
@@ -40,7 +40,7 @@ class ParentRetryTest:
def run(self):
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(self.ts_child)
- tr.MakeCurlCommand(f'"{self.ts_child.Variables.port}" --verbose')
+ tr.MakeCurlCommand(f'"{self.ts_child.Variables.port}" --verbose', ts=self.ts_child)
tr.StillRunningAfter = self.ts_child
diff --git a/tests/gold_tests/pluginTest/TSVConnFd/TSVConnFd.test.py b/tests/gold_tests/pluginTest/TSVConnFd/TSVConnFd.test.py
index ed5f4661d6..3913d8fa34 100644
--- a/tests/gold_tests/pluginTest/TSVConnFd/TSVConnFd.test.py
+++ b/tests/gold_tests/pluginTest/TSVConnFd/TSVConnFd.test.py
@@ -51,6 +51,9 @@ ts.Disk.plugin_config.AddLine(f"{plugin_name}.so {InProgressFilePathspec} {ts.Va
ts.Disk.remap_config.AddLine("map http://myhost.test http://127.0.0.1:{0}".format(server.Variables.Port))
+ipv4flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
# Dummy transaction to trigger plugin.
#
tr = Test.AddTestRun()
@@ -58,7 +61,8 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
tr.MakeCurlCommandMulti(
f'touch {InProgressFilePathspec} ; ' +
- f'{{curl}} --verbose --ipv4 --header "Host:myhost.test" http://localhost:{ts.Variables.port}/')
+ f'{{curl}} --verbose {ipv4flag} --header "Host:myhost.test" http://localhost:{ts.Variables.port}/',
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
# Give tests up to 10 seconds to complete.
diff --git a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests.test.py b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests.test.py
index 72089907ee..bf2a88c57b 100644
--- a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests.test.py
+++ b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests.test.py
@@ -192,7 +192,7 @@ tr = Test.AddTestRun("full asset cache miss bypass")
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -H "uuid: full"')
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -H "uuid: full"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/full.stderr.gold"
tr.StillRunningAfter = ts
@@ -201,7 +201,7 @@ tr.StillRunningAfter = ts
# 1 Test - Fetch range into cache
tr = Test.AddTestRun("inner range cache miss")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {} -H "uuid: inner"'.format(inner_str))
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {} -H "uuid: inner"'.format(inner_str), ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/inner.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss")
@@ -212,7 +212,7 @@ tr.StillRunningAfter = ts
# 2 Test - Fetch from cache
tr = Test.AddTestRun("inner range cache hit")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {}'.format(inner_str))
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {}'.format(inner_str), ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/inner.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit", "expected cache hit")
@@ -225,7 +225,7 @@ tr.StillRunningAfter = ts
# 3 Test - 0- request
tr = Test.AddTestRun("0- request miss")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {} -H "uuid: frange"'.format(frange_str))
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {} -H "uuid: frange"'.format(frange_str), ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/full.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss")
@@ -236,7 +236,7 @@ tr.StillRunningAfter = ts
# 4 Test - 0- request
tr = Test.AddTestRun("0- request hit")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {}'.format(frange_str))
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {}'.format(frange_str), ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/full.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit", "expected cache hit")
@@ -249,7 +249,7 @@ tr.StillRunningAfter = ts
# 5 Test - -5 request miss
tr = Test.AddTestRun("-5 request miss")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {} -H "uuid: last"'.format(last_str))
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {} -H "uuid: last"'.format(last_str), ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/last.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss")
@@ -260,7 +260,7 @@ tr.StillRunningAfter = ts
# 6 Test - -5 request hit
tr = Test.AddTestRun("-5 request hit")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {}'.format(last_str))
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {}'.format(last_str), ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/last.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit", "expected cache hit")
@@ -273,7 +273,7 @@ tr.StillRunningAfter = ts
# 7 Test - 404
tr = Test.AddTestRun("404 request 1st")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/404 -r 0-')
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/404 -r 0-', ts=ts)
ps.Streams.stdout = "gold/404.stdout.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss")
tr.StillRunningAfter = ts
@@ -281,7 +281,7 @@ tr.StillRunningAfter = ts
# 8 Test - 404
tr = Test.AddTestRun("404 request 2nd")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/404 -r 0-')
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/404 -r 0-', ts=ts)
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss")
ps.Streams.stdout.Content += Testers.ContainsExpression("404 Not Found", "expected 404 response")
tr.StillRunningAfter = ts
@@ -289,7 +289,7 @@ tr.StillRunningAfter = ts
# 9 Test - origin returns 200 response to range request
tr = Test.AddTestRun("origin returns 200")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {} -H "uuid: full"')
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {} -H "uuid: full"', ts=ts)
ps.ReturnCode = 3 # <--- note the return code
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss")
ps.Streams.stdout.Content += Testers.ContainsExpression("200 OK", "expected full 200 response")
@@ -301,7 +301,7 @@ curl_and_args = '-s -D /dev/stdout -o /dev/stderr -x localhost:{} -H "x-debug: x
# 10 Test - cache_key_url request
tr = Test.AddTestRun("cache_key_url request")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://parentselect/path -r {} -H "uuid: pselect"'.format(pselect_str))
+tr.MakeCurlCommand(curl_and_args + ' http://parentselect/path -r {} -H "uuid: pselect"'.format(pselect_str), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression(
"X-ParentSelection-Key: .*-bytes=",
@@ -313,7 +313,7 @@ tr.StillRunningAfter = server
# 11 Test - non cache_key_url request ... no X-ParentSelection-Key
tr = Test.AddTestRun("non cache_key_url request")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {} -H "uuid: inner"'.format(inner_str))
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r {} -H "uuid: inner"'.format(inner_str), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ExcludesExpression("X-ParentSelection-Key", "parent select key shouldn't show up")
tr.StillRunningAfter = ts
@@ -322,7 +322,7 @@ tr.StillRunningAfter = server
# 12 Test - cache_key_url request -- deprecated
tr = Test.AddTestRun("cache_key_url request - deprecated")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://psd/path -r {} -H "uuid: pselect"'.format(pselect_str))
+tr.MakeCurlCommand(curl_and_args + ' http://psd/path -r {} -H "uuid: pselect"'.format(pselect_str), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression(
"X-ParentSelection-Key: .*-bytes=",
diff --git a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cache_complete_responses.test.py b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cache_complete_responses.test.py
index c4b6cbf3b9..e36f4f2d73 100644
--- a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cache_complete_responses.test.py
+++ b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cache_complete_responses.test.py
@@ -207,7 +207,7 @@ tr = Test.AddTestRun("cache miss on /obj")
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: SMALL" http://example.com/obj -r 0-5000')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: SMALL" http://example.com/obj -r 0-5000', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK")
ps.Streams.stdout.Content = Testers.ExcludesExpression("Content-Range:", "expected no Content-Range header")
@@ -219,7 +219,7 @@ tr.StillRunningAfter = ts
# 1 Test - Fetch /obj with a different range but less than 4MB
tr = Test.AddTestRun("cache hit-fresh on /obj")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: SMALL" http://example.com/obj -r 5001-5999')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: SMALL" http://example.com/obj -r 5001-5999', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK")
ps.Streams.stdout.Content = Testers.ExcludesExpression("Content-Range:", "expected no Content-Range header")
@@ -232,7 +232,7 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("cache hit-stale on /obj")
tr.DelayStart = 2
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: SMALL-INM" http://example.com/obj -r 0-403')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: SMALL-INM" http://example.com/obj -r 0-403', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK")
ps.Streams.stdout.Content = Testers.ExcludesExpression("Content-Range:", "expected no Content-Range header")
@@ -244,7 +244,7 @@ tr.StillRunningAfter = ts
# 3 Test - Fetch /obj with a different range but less than 4MB
tr = Test.AddTestRun("cache hit on /obj post revalidation")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: SMALL" http://example.com/obj -r 0-3999')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: SMALL" http://example.com/obj -r 0-3999', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK")
ps.Streams.stdout.Content = Testers.ExcludesExpression("Content-Range:", "expected no Content-Range header")
@@ -259,7 +259,7 @@ tr.StillRunningAfter = ts
# 4 Test - Fetch /slice with a Range header but less than 4MB
tr = Test.AddTestRun("cache miss on /slice")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: SLICE" http://example.com/slice -r 0-5000')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: SLICE" http://example.com/slice -r 0-5000', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 Partial Content")
ps.Streams.stdout.Content = Testers.ContainsExpression(
@@ -272,7 +272,7 @@ tr.StillRunningAfter = ts
# 5 Test - Fetch /slice with a different range but less than 4MB
tr = Test.AddTestRun("cache hit-fresh on /slice")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: SLICE" http://example.com/slice -r 5001-5999')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: SLICE" http://example.com/slice -r 5001-5999', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 Partial Content")
ps.Streams.stdout.Content = Testers.ContainsExpression(
@@ -286,7 +286,7 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("cache hit-stale on /slice")
tr.DelayStart = 2
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: SLICE-INM" http://example.com/slice -r 0-403')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: SLICE-INM" http://example.com/slice -r 0-403', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 Partial Content")
ps.Streams.stdout.Content = Testers.ContainsExpression(
@@ -299,7 +299,7 @@ tr.StillRunningAfter = ts
# 7 Test - Fetch /slice with a different range but less than 4MB
tr = Test.AddTestRun("cache hit on /slice post revalidation")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: SLICE" http://example.com/slice -r 0-3999')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: SLICE" http://example.com/slice -r 0-3999', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 Partial Content")
ps.Streams.stdout.Content = Testers.ContainsExpression(
@@ -317,7 +317,7 @@ tr.StillRunningAfter = ts
# 8 Test - Fetch /naieve/obj with a Range header
tr = Test.AddTestRun("cache miss on /naieve/obj")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE" http://example.com/naieve/obj -r 0-5000')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE" http://example.com/naieve/obj -r 0-5000', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK")
ps.Streams.stdout.Content = Testers.ExcludesExpression("Content-Range:", "expected no Content-Range header")
@@ -329,7 +329,7 @@ tr.StillRunningAfter = ts
# 9 Test - Fetch /naieve/obj with the same Range header
tr = Test.AddTestRun("cache hit-fresh on /naieve/obj")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE" http://example.com/naieve/obj -r 0-5000')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE" http://example.com/naieve/obj -r 0-5000', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK")
ps.Streams.stdout.Content = Testers.ExcludesExpression("Content-Range:", "expected no Content-Range header")
@@ -342,7 +342,7 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("cache hit-stale on /naieve/obj")
tr.DelayStart = 2
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE-INM" http://example.com/naieve/obj -r 0-5000')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE-INM" http://example.com/naieve/obj -r 0-5000', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK")
ps.Streams.stdout.Content = Testers.ExcludesExpression("Content-Range:", "expected no Content-Range header")
@@ -354,7 +354,7 @@ tr.StillRunningAfter = ts
# 11 Test - Fetch /naieve/obj with the same Range header
tr = Test.AddTestRun("cache hit on /naieve/obj post revalidation")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE" http://example.com/naieve/obj -r 0-5000')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE" http://example.com/naieve/obj -r 0-5000', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK")
ps.Streams.stdout.Content = Testers.ExcludesExpression("Content-Range:", "expected no Content-Range header")
@@ -366,7 +366,7 @@ tr.StillRunningAfter = ts
# 12 Test - Fetch /naieve/obj with a *different* Range header; note the cache key changes and is a miss for the same object
tr = Test.AddTestRun("cache miss on /naieve/obj")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE" http://example.com/naieve/obj -r 444-777')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE" http://example.com/naieve/obj -r 444-777', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK")
ps.Streams.stdout.Content = Testers.ExcludesExpression("Content-Range:", "expected no Content-Range header")
@@ -379,7 +379,7 @@ tr.StillRunningAfter = ts
# this is why a Range normalization strategy should _always_ be employed when using `--cache-complete-responses`
tr = Test.AddTestRun("cache hit on /naieve/obj")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE" http://example.com/naieve/obj -r 444-777')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE" http://example.com/naieve/obj -r 444-777', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK")
ps.Streams.stdout.Content = Testers.ExcludesExpression("Content-Range:", "expected no Content-Range header")
@@ -391,7 +391,7 @@ tr.StillRunningAfter = ts
# 14 Test - Fetch /naieve/obj with the original Range header (0-5000); still a cache hit
tr = Test.AddTestRun("cache hit on /naieve/obj after requesting with a different Range")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE" http://example.com/naieve/obj -r 0-5000')
+tr.MakeCurlCommand(curl_and_args + ' -H "UID: NAIEVE" http://example.com/naieve/obj -r 0-5000', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK")
ps.Streams.stdout.Content = Testers.ExcludesExpression("Content-Range:", "expected no Content-Range header")
diff --git a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey.test.py b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey.test.py
index 6384c6ebf1..b67a8a54f0 100644
--- a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey.test.py
+++ b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey.test.py
@@ -136,7 +136,7 @@ tr = Test.AddTestRun("full asset fetch")
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -H "uuid: full"')
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -H "uuid: full"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss for load")
tr.StillRunningAfter = ts
@@ -144,7 +144,7 @@ tr.StillRunningAfter = ts
# 1 Test - Fetch whole asset into cache via range request (ensure cold)
tr = Test.AddTestRun("0- asset fetch")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r 0- -H "uuid: range_full"')
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r 0- -H "uuid: range_full"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss for load")
tr.StillRunningAfter = ts
@@ -152,7 +152,7 @@ tr.StillRunningAfter = ts
# 2 Test - Ensure assert happens instead of possible cache poisoning.
tr = Test.AddTestRun("Attempt poisoning")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://www.fail.com/path -r 0- -H "uuid: range_fail"')
+tr.MakeCurlCommand(curl_and_args + ' http://www.fail.com/path -r 0- -H "uuid: range_fail"', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey_global.test.py b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey_global.test.py
index 3603b6c5cb..748b28633b 100644
--- a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey_global.test.py
+++ b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_cachekey_global.test.py
@@ -138,7 +138,7 @@ tr = Test.AddTestRun("asset fetch via range")
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r0- -H "uuid: full"')
+tr.MakeCurlCommand(curl_and_args + ' http://www.example.com/path -r0- -H "uuid: full"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression(
"X-Cache-Key: /foo/Range:bytes=0-/path", "expected cachekey style range request in cachekey")
diff --git a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_ims.test.py b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_ims.test.py
index a4f70716f1..bb8e4cdd8b 100644
--- a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_ims.test.py
+++ b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests_ims.test.py
@@ -95,7 +95,7 @@ tr = Test.AddTestRun("0- range cache load")
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' http://ims/path -r 0-')
+tr.MakeCurlCommand(curl_and_args + ' http://ims/path -r 0-', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss for load")
tr.StillRunningAfter = ts
@@ -104,7 +104,7 @@ tr.StillRunningAfter = ts
# 1 Test - Fetch range into cache
tr = Test.AddTestRun("0- cache hit check")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://ims/path -r 0-')
+tr.MakeCurlCommand(curl_and_args + ' http://ims/path -r 0-', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit", "expected cache hit")
tr.StillRunningAfter = ts
@@ -116,7 +116,7 @@ futurestr = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime(futuretime))
# 2 Test - Ensure X-CRR-IMS header results in hit-stale
tr = Test.AddTestRun("0- range X-CRR-IMS check")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://ims/path -r 0- -H "X-CRR-IMS: {}"'.format(futurestr))
+tr.MakeCurlCommand(curl_and_args + ' http://ims/path -r 0- -H "X-CRR-IMS: {}"'.format(futurestr), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-stale", "expected cache hit-stale")
tr.StillRunningAfter = ts
@@ -127,7 +127,7 @@ futurestr = time.strftime("%a, %d %b %Y %H:%M:%S GMT", time.gmtime(futuretime))
# 3 Test - Ensure CrrIms header results in hit-stale
tr = Test.AddTestRun("0- range CrrIms check, override header")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://imsheader/path -r 0- -H "CrrIms: {}"'.format(futurestr))
+tr.MakeCurlCommand(curl_and_args + ' http://imsheader/path -r 0- -H "CrrIms: {}"'.format(futurestr), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-stale", "expected cache hit-stale")
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/cert_update/cert_update.test.py b/tests/gold_tests/pluginTest/cert_update/cert_update.test.py
index 1bb20b1237..3d2766a4ad 100644
--- a/tests/gold_tests/pluginTest/cert_update/cert_update.test.py
+++ b/tests/gold_tests/pluginTest/cert_update/cert_update.test.py
@@ -23,6 +23,7 @@ Test.Summary = '''
Test cert_update plugin.
'''
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
Test.SkipUnless(
Condition.HasProgram("openssl", "Openssl need to be installed on system for this test to work"),
Condition.PluginExists('cert_update.so'))
@@ -78,7 +79,8 @@ Test.PrepareInstalledPlugin('cert_update.so', ts)
tr = Test.AddTestRun("Server-Cert-Pre")
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand('--verbose --insecure --ipv4 --resolve bar.com:{0}:127.0.0.1 https://bar.com:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ '--verbose --insecure --ipv4 --resolve bar.com:{0}:127.0.0.1 https://bar.com:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.Streams.stderr = "gold/server-cert-pre.gold"
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = server
@@ -95,7 +97,8 @@ ts.StillRunningAfter = server
# after use traffic_ctl to update server cert, curl should see bar.com cert from bob
tr = Test.AddTestRun("Server-Cert-After")
tr.Processes.Default.Env = ts.Env
-tr.MakeCurlCommand('--verbose --insecure --ipv4 --resolve bar.com:{0}:127.0.0.1 https://bar.com:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ '--verbose --insecure --ipv4 --resolve bar.com:{0}:127.0.0.1 https://bar.com:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.Streams.stderr = "gold/server-cert-after.gold"
tr.Processes.Default.ReturnCode = 0
ts.StillRunningAfter = server
@@ -107,7 +110,7 @@ s_server = tr.Processes.Process(
"s_server", "openssl s_server -www -key {0}/server1.pem -cert {0}/server1.pem -accept {1} -Verify 1 -msg".format(
ts.Variables.SSLDir, ts.Variables.s_server_port))
s_server.Ready = When.PortReady(ts.Variables.s_server_port)
-tr.MakeCurlCommand('--verbose --insecure --ipv4 --header "Host: foo.com" https://localhost:{}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('--verbose --insecure --ipv4 --header "Host: foo.com" https://localhost:{}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.StartBefore(s_server)
s_server.Streams.all = "gold/client-cert-pre.gold"
tr.Processes.Default.ReturnCode = 0
@@ -131,7 +134,8 @@ s_server = tr.Processes.Process(
s_server.Ready = When.PortReady(ts.Variables.s_server_port)
tr.Processes.Default.Env = ts.Env
# Move client2.pem to replace client1.pem since cert path matters in client context mapping
-tr.MakeCurlCommand('--verbose --insecure --ipv4 --header "Host: foo.com" https://localhost:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ '--verbose --insecure --ipv4 --header "Host: foo.com" https://localhost:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.StartBefore(s_server)
s_server.Streams.all = "gold/client-cert-after.gold"
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/pluginTest/client_context_dump/client_context_dump.test.py b/tests/gold_tests/pluginTest/client_context_dump/client_context_dump.test.py
index a77add485f..195caf5679 100644
--- a/tests/gold_tests/pluginTest/client_context_dump/client_context_dump.test.py
+++ b/tests/gold_tests/pluginTest/client_context_dump/client_context_dump.test.py
@@ -64,7 +64,7 @@ t = Test.AddTestRun("Test traffic server started properly")
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)
diff --git a/tests/gold_tests/pluginTest/compress/compress.gold b/tests/gold_tests/pluginTest/compress/compress.gold
index 6ea1a62eee..6745b65f0a 100644
--- a/tests/gold_tests/pluginTest/compress/compress.gold
+++ b/tests/gold_tests/pluginTest/compress/compress.gold
@@ -1,4 +1,4 @@
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``/obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/gzip, deflate, sdch, br
> Accept-Encoding: gzip, deflate, sdch, br
< HTTP/1.1 200 OK
@@ -7,7 +7,7 @@
< Vary: Accept-Encoding
< Content-Length: 46
===
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``/obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
@@ -16,7 +16,7 @@
< Vary: Accept-Encoding
< Content-Length: 7``
===
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``/obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/br
> Accept-Encoding: br
< HTTP/1.1 200 OK
@@ -25,14 +25,14 @@
< Vary: Accept-Encoding
< Content-Length: 46
===
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``/obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Length: 1049
===
-> GET http://ae-1/obj1 HTTP/1.1
+> GET ``/obj1 HTTP/1.1
> X-Ats-Compress-Test: 1/gzip, deflate, sdch, br
> Accept-Encoding: gzip, deflate, sdch, br
< HTTP/1.1 200 OK
@@ -41,7 +41,7 @@
< Vary: Accept-Encoding
< Content-Length: 7``
===
-> GET http://ae-1/obj1 HTTP/1.1
+> GET ``/obj1 HTTP/1.1
> X-Ats-Compress-Test: 1/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
@@ -50,21 +50,21 @@
< Vary: Accept-Encoding
< Content-Length: 7``
===
-> GET http://ae-1/obj1 HTTP/1.1
+> GET ``/obj1 HTTP/1.1
> X-Ats-Compress-Test: 1/br
> Accept-Encoding: br
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Length: 1049
===
-> GET http://ae-1/obj1 HTTP/1.1
+> GET ``/obj1 HTTP/1.1
> X-Ats-Compress-Test: 1/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Length: 1049
===
-> GET http://ae-2/obj2 HTTP/1.1
+> GET ``/obj2 HTTP/1.1
> X-Ats-Compress-Test: 2/gzip, deflate, sdch, br
> Accept-Encoding: gzip, deflate, sdch, br
< HTTP/1.1 200 OK
@@ -73,7 +73,7 @@
< Vary: Accept-Encoding
< Content-Length: 46
===
-> GET http://ae-2/obj2 HTTP/1.1
+> GET ``/obj2 HTTP/1.1
> X-Ats-Compress-Test: 2/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
@@ -82,7 +82,7 @@
< Vary: Accept-Encoding
< Content-Length: 7``
===
-> GET http://ae-2/obj2 HTTP/1.1
+> GET ``/obj2 HTTP/1.1
> X-Ats-Compress-Test: 2/br
> Accept-Encoding: br
< HTTP/1.1 200 OK
@@ -91,14 +91,14 @@
< Vary: Accept-Encoding
< Content-Length: 46
===
-> GET http://ae-2/obj2 HTTP/1.1
+> GET ``/obj2 HTTP/1.1
> X-Ats-Compress-Test: 2/deflate
> Accept-Encoding: deflate
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Length: 1049
===
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``/obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/gzip;q=0.666
> Accept-Encoding: gzip;q=0.666
< HTTP/1.1 200 OK
@@ -107,7 +107,7 @@
< Vary: Accept-Encoding
< Content-Length: 7``
===
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``/obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/gzip;q=0.666x
> Accept-Encoding: gzip;q=0.666x
< HTTP/1.1 200 OK
@@ -116,7 +116,7 @@
< Vary: Accept-Encoding
< Content-Length: 7``
===
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``/obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/gzip;q=#0.666
> Accept-Encoding: gzip;q=#0.666
< HTTP/1.1 200 OK
@@ -125,7 +125,7 @@
< Vary: Accept-Encoding
< Content-Length: 7``
===
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``/obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/gzip; Q = 0.666
> Accept-Encoding: gzip; Q = 0.666
< HTTP/1.1 200 OK
@@ -134,14 +134,14 @@
< Vary: Accept-Encoding
< Content-Length: 7``
===
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/gzip;q=0.0
> Accept-Encoding: gzip;q=0.0
< HTTP/1.1 200 OK
< Content-Type: text/javascript
< Content-Length: 1049
===
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/gzip;q=-0.1
> Accept-Encoding: gzip;q=-0.1
< HTTP/1.1 200 OK
@@ -150,7 +150,7 @@
< Vary: Accept-Encoding
< Content-Length: 7``
===
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``/obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/aaa, gzip;q=0.666, bbb
> Accept-Encoding: aaa, gzip;q=0.666, bbb
< HTTP/1.1 200 OK
@@ -159,7 +159,7 @@
< Vary: Accept-Encoding
< Content-Length: 7``
===
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``/obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/ br ; q=0.666, bbb
> Accept-Encoding: br ; q=0.666, bbb
< HTTP/1.1 200 OK
@@ -168,7 +168,7 @@
< Vary: Accept-Encoding
< Content-Length: 46
===
-> GET http://ae-0/obj0 HTTP/1.1
+> GET ``/obj0 HTTP/1.1
> X-Ats-Compress-Test: 0/aaa, gzip;q=0.666 ,
> Accept-Encoding: aaa, gzip;q=0.666 ,
< HTTP/1.1 200 OK
@@ -177,7 +177,7 @@
< Vary: Accept-Encoding
< Content-Length: 7``
===
-> POST http://ae-3/obj3 HTTP/1.1
+> POST ``/obj3 HTTP/1.1
> X-Ats-Compress-Test: 3/gzip
> Accept-Encoding: gzip
< HTTP/1.1 200 OK
diff --git a/tests/gold_tests/pluginTest/compress/compress.test.py b/tests/gold_tests/pluginTest/compress/compress.test.py
index 079b5406db..fd34c6f752 100644
--- a/tests/gold_tests/pluginTest/compress/compress.test.py
+++ b/tests/gold_tests/pluginTest/compress/compress.test.py
@@ -133,7 +133,7 @@ for i in range(3):
waitForServer = False
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
- tr.MakeCurlCommand(curl(ts, i, 'gzip, deflate, sdch, br', out_path))
+ tr.MakeCurlCommand(curl(ts, i, 'gzip, deflate, sdch, br', out_path), ts=ts)
tr = Test.AddTestRun(f'verify gzip, deflate, sdch, br: {i}')
tr.ReturnCode = 0
if i == 0:
@@ -146,7 +146,7 @@ for i in range(3):
tr = Test.AddTestRun(f'gzip: {i}')
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
- tr.MakeCurlCommand(curl(ts, i, "gzip", out_path))
+ tr.MakeCurlCommand(curl(ts, i, "gzip", out_path), ts=ts)
tr = Test.AddTestRun(f'verify gzip: {i}')
tr.ReturnCode = 0
tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
@@ -154,7 +154,7 @@ for i in range(3):
tr = Test.AddTestRun(f'br: {i}')
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
- tr.MakeCurlCommand(curl(ts, i, "br", out_path))
+ tr.MakeCurlCommand(curl(ts, i, "br", out_path), ts=ts)
tr = Test.AddTestRun(f'verify br: {i}')
tr.ReturnCode = 0
if i == 1:
@@ -165,7 +165,7 @@ for i in range(3):
tr = Test.AddTestRun(f'deflate: {i}')
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
- tr.MakeCurlCommand(curl(ts, i, "deflate", out_path))
+ tr.MakeCurlCommand(curl(ts, i, "deflate", out_path), ts=ts)
tr = Test.AddTestRun(f'verify deflate: {i}')
tr.ReturnCode = 0
tr.Processes.Default.Command = f"diff {out_path} {orig_path}"
@@ -175,7 +175,7 @@ for i in range(3):
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
-tr.MakeCurlCommand(curl(ts, 0, "gzip;q=0.666", out_path))
+tr.MakeCurlCommand(curl(ts, 0, "gzip;q=0.666", out_path), ts=ts)
tr = Test.AddTestRun(f'verify gzip;q=0.666')
tr.ReturnCode = 0
tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
@@ -183,7 +183,7 @@ tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
-tr.MakeCurlCommand(curl(ts, 0, "gzip;q=0.666x", out_path))
+tr.MakeCurlCommand(curl(ts, 0, "gzip;q=0.666x", out_path), ts=ts)
tr = Test.AddTestRun(f'verify gzip;q=0.666x')
tr.ReturnCode = 0
tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
@@ -191,7 +191,7 @@ tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
-tr.MakeCurlCommand(curl(ts, 0, "gzip;q=#0.666", out_path))
+tr.MakeCurlCommand(curl(ts, 0, "gzip;q=#0.666", out_path), ts=ts)
tr = Test.AddTestRun(f'verify gzip;q=#0.666')
tr.ReturnCode = 0
tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
@@ -199,7 +199,7 @@ tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
-tr.MakeCurlCommand(curl(ts, 0, "gzip; Q = 0.666", out_path))
+tr.MakeCurlCommand(curl(ts, 0, "gzip; Q = 0.666", out_path), ts=ts)
tr = Test.AddTestRun(f'verify gzip; Q = 0.666')
tr.ReturnCode = 0
tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
@@ -207,7 +207,7 @@ tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
-tr.MakeCurlCommand(curl(ts, 0, "gzip;q=0.0", out_path))
+tr.MakeCurlCommand(curl(ts, 0, "gzip;q=0.0", out_path), ts=ts)
tr = Test.AddTestRun(f'verify gzip;q=0.0')
tr.ReturnCode = 0
tr.Processes.Default.Command = f"diff {out_path} {orig_path}"
@@ -215,7 +215,7 @@ tr.Processes.Default.Command = f"diff {out_path} {orig_path}"
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
-tr.MakeCurlCommand(curl(ts, 0, "gzip;q=-0.1", out_path))
+tr.MakeCurlCommand(curl(ts, 0, "gzip;q=-0.1", out_path), ts=ts)
tr = Test.AddTestRun(f'verify gzip;q=-0.1')
tr.ReturnCode = 0
tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
@@ -223,7 +223,7 @@ tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
-tr.MakeCurlCommand(curl(ts, 0, "aaa, gzip;q=0.666, bbb", out_path))
+tr.MakeCurlCommand(curl(ts, 0, "aaa, gzip;q=0.666, bbb", out_path), ts=ts)
tr = Test.AddTestRun(f'verify aaa, gzip;q=0.666, bbb')
tr.ReturnCode = 0
tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
@@ -231,7 +231,7 @@ tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
-tr.MakeCurlCommand(curl(ts, 0, " br ; q=0.666, bbb", out_path))
+tr.MakeCurlCommand(curl(ts, 0, " br ; q=0.666, bbb", out_path), ts=ts)
tr = Test.AddTestRun(f'verify br ; q=0.666, bbb')
tr.ReturnCode = 0
tr.Processes.Default.Command = get_verify_command(out_path, "brotli -d")
@@ -239,7 +239,7 @@ tr.Processes.Default.Command = get_verify_command(out_path, "brotli -d")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
-tr.MakeCurlCommand(curl(ts, 0, "aaa, gzip;q=0.666 , ", out_path))
+tr.MakeCurlCommand(curl(ts, 0, "aaa, gzip;q=0.666 , ", out_path), ts=ts)
tr = Test.AddTestRun(f'verify aaa, gzip;q=0.666 , ')
tr.ReturnCode = 0
tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
@@ -248,7 +248,7 @@ tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
out_path = get_out_path()
-tr.MakeCurlCommand(curl_post(ts, 3, "gzip", out_path))
+tr.MakeCurlCommand(curl_post(ts, 3, "gzip", out_path), ts=ts)
tr = Test.AddTestRun(f'verify gzip post')
tr.ReturnCode = 0
tr.Processes.Default.Command = get_verify_command(out_path, "gunzip -k")
diff --git a/tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py
index 97a4eb17a1..98350d6160 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/bucketcookie.test.py
@@ -83,7 +83,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=333" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -99,7 +100,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=etc" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server2, ready=When.PortOpen(server2.Variables.Port))
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/cookie_remap/collapseslashes.test.py b/tests/gold_tests/pluginTest/cookie_remap/collapseslashes.test.py
index b0c868875d..27eab2b8f3 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/collapseslashes.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/collapseslashes.test.py
@@ -68,7 +68,8 @@ tr.MakeCurlCommand(
"http://www.example.com/magic" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
diff --git a/tests/gold_tests/pluginTest/cookie_remap/connector.test.py b/tests/gold_tests/pluginTest/cookie_remap/connector.test.py
index cc5cca8d75..fdd1f163e9 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/connector.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/connector.test.py
@@ -83,7 +83,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=abcd icecream=donteat" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -99,7 +100,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=somethingelse" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server2, ready=When.PortOpen(server2.Variables.Port))
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py
index ab6b4c89a1..915960f757 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/existscookie.test.py
@@ -83,7 +83,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=fdkfkdfkdfkdkdfkdfk" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -99,7 +100,8 @@ tr.MakeCurlCommand(
-H"Cookie: breadcrumb=etc" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server2, ready=When.PortOpen(server2.Variables.Port))
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py
index fcd1069c4e..44d938c821 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/matchcookie.test.py
@@ -83,7 +83,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=magic" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -99,7 +100,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=magit" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server2, ready=When.PortOpen(server2.Variables.Port))
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py b/tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py
index c986761b9d..d206086258 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/matchuri.test.py
@@ -82,7 +82,8 @@ tr.MakeCurlCommand(
"http://www.example.com/magic/thisispartofthepath" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -98,7 +99,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=etc" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server2, ready=When.PortOpen(server2.Variables.Port))
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/cookie_remap/notexistscookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/notexistscookie.test.py
index d984c3fd4f..e3fb69c781 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/notexistscookie.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/notexistscookie.test.py
@@ -82,7 +82,8 @@ tr.MakeCurlCommand(
"http://www.example.com/magic" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -98,7 +99,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=etc" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server2, ready=When.PortOpen(server2.Variables.Port))
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/cookie_remap/pcollapseslashes.test.py b/tests/gold_tests/pluginTest/cookie_remap/pcollapseslashes.test.py
index 9004490aea..fcf949780b 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/pcollapseslashes.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/pcollapseslashes.test.py
@@ -68,7 +68,8 @@ tr.MakeCurlCommand(
"http://www.example.com/orig_path" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
diff --git a/tests/gold_tests/pluginTest/cookie_remap/psubstitute.test.py b/tests/gold_tests/pluginTest/cookie_remap/psubstitute.test.py
index 2848ee1b17..e353d721d9 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/psubstitute.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/psubstitute.test.py
@@ -93,7 +93,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=abcd" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -107,7 +108,8 @@ tr.MakeCurlCommand(
-H"Cookie: oxalpha=3333" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -119,7 +121,8 @@ tr.MakeCurlCommand(
-H"Cookie: acgamma=dfndfdfd" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -130,7 +133,8 @@ tr.MakeCurlCommand(
"http://www.example.com/magic/foobar" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py
index df70434740..c5a39d7d61 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py
@@ -83,7 +83,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=ilove-oreos-chipsahoy-icecream" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -99,7 +100,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=etc" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server2, ready=When.PortOpen(server2.Variables.Port))
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py b/tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py
index 142126bf84..55b30a2649 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/setstatus.test.py
@@ -53,7 +53,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=magic" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
@@ -68,7 +69,8 @@ tr.MakeCurlCommand(
-H "Proxy-Connection: keep-alive" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py
index f94c3f735d..3ef426f076 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/subcookie.test.py
@@ -81,7 +81,8 @@ tr = Test.AddTestRun("cookie value matches")
# be interpreted by the autest framework or the shell (tried escaping with \)
tr.MakeCurlCommand(
'--proxy 127.0.0.1:{0} "http://www.example.com" -H"Cookie: fpbeta=a=1&b=2&c=3" -H "Proxy-Connection: keep-alive" --verbose '
- .format(ts.Variables.port))
+ .format(ts.Variables.port),
+ ts=ts)
# tr.Processes.Default.Command = '''
# curl
# --proxy 127.0.0.1:{0}
@@ -101,7 +102,8 @@ server.Streams.All = "gold/matchcookie.gold"
tr = Test.AddTestRun("cookie value doesn't match")
tr.MakeCurlCommand(
'--proxy 127.0.0.1:{0} "http://www.example.com" -H"Cookie: fpbeta=a=1&b=2&c=4" -H "Proxy-Connection: keep-alive" --verbose '
- .format(ts.Variables.port))
+ .format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server2, ready=When.PortOpen(server2.Variables.Port))
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/cookie_remap/substitute.test.py b/tests/gold_tests/pluginTest/cookie_remap/substitute.test.py
index ce8900d9ca..346a7544ed 100644
--- a/tests/gold_tests/pluginTest/cookie_remap/substitute.test.py
+++ b/tests/gold_tests/pluginTest/cookie_remap/substitute.test.py
@@ -83,7 +83,8 @@ tr.MakeCurlCommand(
-H"Cookie: fpbeta=abcd" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -97,7 +98,8 @@ tr.MakeCurlCommand(
-H"Cookie: oxalpha=3333" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -109,7 +111,8 @@ tr.MakeCurlCommand(
-H"Cookie: acgamma=dfndfdfd" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -120,7 +123,8 @@ tr.MakeCurlCommand(
"http://www.example.com/magic/foobar" \
-H "Proxy-Connection: keep-alive" \
--verbose \
-'''.format(ts.Variables.port))
+'''.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/pluginTest/esi/esi.test.py b/tests/gold_tests/pluginTest/esi/esi.test.py
index 7217d6bcfc..0d83a8e5ee 100644
--- a/tests/gold_tests/pluginTest/esi/esi.test.py
+++ b/tests/gold_tests/pluginTest/esi/esi.test.py
@@ -202,7 +202,8 @@ echo date('l jS \of F Y h:i:s A');
tr = Test.AddTestRun(f"First request for esi.php: not cached: {self._plugin_config}")
tr.MakeCurlCommand(
f'http://127.0.0.1:{self._ts.Variables.port}/esi.php -H"Host: www.example.com" '
- '-H"Accept: */*" --verbose')
+ '-H"Accept: */*" --verbose',
+ ts=self._ts)
tr.Processes.Default.ReturnCode = 0
self._configure_client_output_expectations(tr.Processes.Default)
tr.StillRunningAfter = self._server
@@ -212,7 +213,8 @@ echo date('l jS \of F Y h:i:s A');
tr = Test.AddTestRun(f"Second request for esi.php: will be cached: {self._plugin_config}")
tr.MakeCurlCommand(
f'http://127.0.0.1:{self._ts.Variables.port}/esi.php -H"Host: www.example.com" '
- '-H"Accept: */*" --verbose')
+ '-H"Accept: */*" --verbose',
+ ts=self._ts)
tr.Processes.Default.ReturnCode = 0
self._configure_client_output_expectations(tr.Processes.Default)
tr.StillRunningAfter = self._server
@@ -225,7 +227,8 @@ echo date('l jS \of F Y h:i:s A');
gzipped_body_file = unzipped_body_file + ".gz"
tr.MakeCurlCommand(
f'http://127.0.0.1:{self._ts.Variables.port}/esi.php -H"Host: www.example.com" '
- f'-H "Accept-Encoding: gzip" -H"Accept: */*" --verbose --output {gzipped_body_file}')
+ f'-H "Accept-Encoding: gzip" -H"Accept: */*" --verbose --output {gzipped_body_file}',
+ ts=self._ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Ready = When.FileExists(gzipped_body_file)
tr.Processes.Default.Streams.stderr = "gold/esi_gzipped.gold"
@@ -250,7 +253,8 @@ echo date('l jS \of F Y h:i:s A');
tr.MakeCurlCommand(
f'http://127.0.0.1:{self._ts.Variables.port}/expect_empty_body '
'-H"Host: www.example.com" -H"Accept-Encoding: gzip" -H"Accept: */*" '
- f'--verbose --output {gzipped_empty_body}')
+ f'--verbose --output {gzipped_empty_body}',
+ ts=self._ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Ready = When.FileExists(gzipped_empty_body)
tr.Processes.Default.Streams.stderr = "gold/empty_response_body.gold"
@@ -273,7 +277,8 @@ echo date('l jS \of F Y h:i:s A');
tr = Test.AddTestRun(f"Max doc size too small: {self._plugin_config}")
tr.MakeCurlCommand(
f'http://127.0.0.1:{self._ts.Variables.port}/esi.php '
- '-H"Host: www.example.com" -H"Accept: */*" --verbose')
+ '-H"Host: www.example.com" -H"Accept: */*" --verbose',
+ ts=self._ts)
tr.Processes.Default.ReturnCode = 0
self._ts.Disk.diags_log.Content = Testers.ContainsExpression(
r"ERROR: \[_setup\] Cannot allow attempted doc of size 121; Max allowed size is 100",
@@ -286,7 +291,8 @@ echo date('l jS \of F Y h:i:s A');
tr = Test.AddTestRun(f"First request for esi.php: gzip not accepted: {self._plugin_config}")
tr.MakeCurlCommand(
f'http://127.0.0.1:{self._ts.Variables.port}/esi.php '
- '-H"Host: www.example.com" -H"Accept: */*" --verbose')
+ '-H"Host: www.example.com" -H"Accept: */*" --verbose',
+ ts=self._ts)
tr.Processes.Default.ReturnCode = 0
self._configure_client_output_expectations(tr.Processes.Default)
tr.StillRunningAfter = self._server
@@ -297,7 +303,8 @@ echo date('l jS \of F Y h:i:s A');
tr = Test.AddTestRun(f"Verify the ESI plugin refuses to gzip responses with: {self._plugin_config}")
tr.MakeCurlCommand(
f'http://127.0.0.1:{self._ts.Variables.port}/esi.php '
- '-H"Host: www.example.com" -H "Accept-Encoding: gzip" -H"Accept: */*" --verbose')
+ '-H"Host: www.example.com" -H "Accept-Encoding: gzip" -H"Accept: */*" --verbose',
+ ts=self._ts)
tr.Processes.Default.ReturnCode = 0
self._configure_client_output_expectations(tr.Processes.Default)
tr.StillRunningAfter = self._server
diff --git a/tests/gold_tests/pluginTest/esi/esi_304.test.py b/tests/gold_tests/pluginTest/esi/esi_304.test.py
index 7aa78b0cc5..62b60bf79e 100644
--- a/tests/gold_tests/pluginTest/esi/esi_304.test.py
+++ b/tests/gold_tests/pluginTest/esi/esi_304.test.py
@@ -152,7 +152,8 @@ No Date
tr = Test.AddTestRun("First request for esi_etag.php: not cached")
tr.MakeCurlCommand(
'http://127.0.0.1:{0}/esi_etag.php -H"Host: www.example.com" '
- '-H"Accept: */*" -H"uuid: first" --verbose -o /dev/stderr'.format(self._ts.Variables.port))
+ '-H"Accept: */*" -H"uuid: first" --verbose -o /dev/stderr'.format(self._ts.Variables.port),
+ ts=self._ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/esi_private_headers.gold"
tr.StillRunningAfter = self._server
@@ -162,7 +163,8 @@ No Date
tr = Test.AddTestRun("Second request for esi_etag.php: will be cached")
tr.MakeCurlCommand(
'http://127.0.0.1:{0}/esi_etag.php -H"Host: www.example.com" '
- '-H"Accept: */*" -H"uuid: second" --verbose -o /dev/stderr'.format(self._ts.Variables.port))
+ '-H"Accept: */*" -H"uuid: second" --verbose -o /dev/stderr'.format(self._ts.Variables.port),
+ ts=self._ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/esi_private_headers.gold"
tr.StillRunningAfter = self._server
diff --git a/tests/gold_tests/pluginTest/esi/esi_nested_include.test.py b/tests/gold_tests/pluginTest/esi/esi_nested_include.test.py
index 906b29e529..d9ea49442d 100644
--- a/tests/gold_tests/pluginTest/esi/esi_nested_include.test.py
+++ b/tests/gold_tests/pluginTest/esi/esi_nested_include.test.py
@@ -120,7 +120,8 @@ class EsiTest():
tr = Test.AddTestRun("First request")
tr.MakeCurlCommand(
f'http://127.0.0.1:{self._ts.Variables.port}/main.php -H"Host: www.example.com" '
- '-H"Accept: */*" --verbose')
+ '-H"Accept: */*" --verbose',
+ ts=self._ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/nested_include_body.gold"
tr.StillRunningAfter = self._server
diff --git a/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-303.gold b/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-303.gold
index 94a42adfb5..971c4bcf78 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-303.gold
+++ b/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-303.gold
@@ -1,5 +1,5 @@
``
-> GET http://www.example.com``
+> GET ``
> Host: www.example.com``
> User-Agent: curl/``
> Accept: */*
diff --git a/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-client.gold b/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-client.gold
index 418608bcb5..b8f23d74df 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-client.gold
+++ b/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-client.gold
@@ -1,5 +1,5 @@
``
-> GET http://www.example.com``
+> GET ``
> Host: www.example.com``
> User-Agent: curl/``
> Accept: */*
diff --git a/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-l_value.gold b/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-l_value.gold
index 8c3cf6649a..9e2e304abc 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-l_value.gold
+++ b/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-l_value.gold
@@ -1,5 +1,5 @@
``
-> GET http://www.example.com``
+> GET ``
> Host: www.example.com``
> User-Agent: curl/``
> Accept: */*
diff --git a/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite_cond_method.gold b/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite_cond_method.gold
index 3fb44fbfe3..0afb37beea 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite_cond_method.gold
+++ b/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite_cond_method.gold
@@ -1,5 +1,5 @@
``
-> `` http://www.example.com/ HTTP/1.1
+> `` `` HTTP/1.1
> Host: www.example.com
``
< HTTP/1.1 200 OK
diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite.test.py
index 6e72b6b107..db5babf3da 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite.test.py
+++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite.test.py
@@ -47,7 +47,7 @@ ts.Disk.remap_config.AddLine('map http://www.example.com:8080 http://127.0.0.1:{
# call localhost straight
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--proxy 127.0.0.1:{0} "http://www.example.com" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port))
+ '--proxy 127.0.0.1:{0} "http://www.example.com" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_cache.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_cache.test.py
index 6b85d07ece..28d29b3a56 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_cache.test.py
+++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_cache.test.py
@@ -59,7 +59,7 @@ curlRequest = (
# Test Case
tr = Test.AddTestRun()
-tr.MakeCurlCommandMulti(curlRequest.format(ts.Variables.port))
+tr.MakeCurlCommandMulti(curlRequest.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_method.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_method.test.py
index 434f6faad5..a3e3babce2 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_method.test.py
+++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_method.test.py
@@ -53,7 +53,7 @@ expected_output = "gold/header_rewrite_cond_method.gold"
expected_log = "gold/header_rewrite-tag.gold"
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--proxy 127.0.0.1:{0} "http://www.example.com" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port))
+ '--proxy 127.0.0.1:{0} "http://www.example.com" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -65,7 +65,8 @@ ts.Disk.traffic_out.Content = expected_log
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'--request DELETE --proxy 127.0.0.1:{0} "http://www.example.com" -H "Proxy-Connection: keep-alive" --verbose'.format(
- ts.Variables.port))
+ ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = expected_output
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_ssn_txn_count.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_ssn_txn_count.test.py
index 98aab8f52d..363ae29796 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_ssn_txn_count.test.py
+++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_cond_ssn_txn_count.test.py
@@ -93,7 +93,7 @@ curlRequest = (
'{{curl}} -v -H\'Host: www.example.com\' -H\'Connection: close\' http://127.0.0.1:{0}/world')
tr = Test.AddTestRun("Add connection close header when ssn-txn-count > 2")
-tr.MakeCurlCommandMulti(curlRequest.format(ts.Variables.port))
+tr.MakeCurlCommandMulti(curlRequest.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_l_value.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_l_value.test.py
index 49a0f3bf19..5c04f72570 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_l_value.test.py
+++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_l_value.test.py
@@ -51,7 +51,7 @@ ts.Disk.remap_config.AddLine('map http://www.example.com:8080 http://127.0.0.1:{
# [L] test
tr = Test.AddTestRun("Header Rewrite End [L]")
tr.MakeCurlCommand(
- '--proxy 127.0.0.1:{0} "http://www.example.com" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port))
+ '--proxy 127.0.0.1:{0} "http://www.example.com" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_set_body_from.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_set_body_from.test.py
index cd40544d74..f4c47e6edb 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_set_body_from.test.py
+++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_set_body_from.test.py
@@ -83,7 +83,8 @@ class HeaderRewriteSetBodyFromTest:
This uses the case where no remap rule is provided
'''
tr = Test.AddTestRun()
- tr.MakeCurlCommand('-s -v --proxy 127.0.0.1:{0} "http://www.example.com/remap_fail"'.format(self.ts.Variables.port))
+ tr.MakeCurlCommand(
+ '-s -v --proxy 127.0.0.1:{0} "http://www.example.com/remap_fail"'.format(self.ts.Variables.port), ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(self.server)
tr.Processes.Default.StartBefore(self.ts)
@@ -97,7 +98,8 @@ class HeaderRewriteSetBodyFromTest:
Triggered from remap file
'''
tr = Test.AddTestRun()
- tr.MakeCurlCommand('-s -v --proxy 127.0.0.1:{0} "http://www.example.com/remap_success"'.format(self.ts.Variables.port))
+ tr.MakeCurlCommand(
+ '-s -v --proxy 127.0.0.1:{0} "http://www.example.com/remap_success"'.format(self.ts.Variables.port), ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/header_rewrite-set_body_from_success.gold"
tr.Processes.Default.Streams.stderr.Content = Testers.ContainsExpression("404 Not Found", "Expected 404 response")
@@ -109,7 +111,8 @@ class HeaderRewriteSetBodyFromTest:
Triggered from plugin file
'''
tr = Test.AddTestRun()
- tr.MakeCurlCommand('-s -v --proxy 127.0.0.1:{0} "http://www.example.com/plugin_success"'.format(self.ts.Variables.port))
+ tr.MakeCurlCommand(
+ '-s -v --proxy 127.0.0.1:{0} "http://www.example.com/plugin_success"'.format(self.ts.Variables.port), ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/header_rewrite-set_body_from_success.gold"
tr.Processes.Default.Streams.stderr.Content = Testers.ContainsExpression("404 Not Found", "Expected 404 response")
@@ -122,7 +125,8 @@ class HeaderRewriteSetBodyFromTest:
Triggered from plugin file
'''
tr = Test.AddTestRun()
- tr.MakeCurlCommand('-s -v --proxy 127.0.0.1:{0} "http://www.example.com/plugin_fail"'.format(self.ts.Variables.port))
+ tr.MakeCurlCommand(
+ '-s -v --proxy 127.0.0.1:{0} "http://www.example.com/plugin_fail"'.format(self.ts.Variables.port), ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/header_rewrite-set_body_from_conn_fail.gold"
tr.Processes.Default.Streams.stderr.Content = Testers.ContainsExpression("404 Not Found", "Expected 404 response")
@@ -136,7 +140,7 @@ class HeaderRewriteSetBodyFromTest:
Ideally, this would not occur.
'''
tr = Test.AddTestRun()
- tr.MakeCurlCommand('-s -v --proxy 127.0.0.1:{0} "http://www.example.com/200"'.format(self.ts.Variables.port))
+ tr.MakeCurlCommand('-s -v --proxy 127.0.0.1:{0} "http://www.example.com/200"'.format(self.ts.Variables.port), ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/header_rewrite-set_body_from_200.gold"
tr.Processes.Default.Streams.stderr.Content = Testers.ContainsExpression("500 INKApi Error", "Expected 500 response")
diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url.test.py
index db4fb86e1f..469bacbb86 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url.test.py
+++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url.test.py
@@ -60,7 +60,8 @@ ts.Disk.remap_config.AddLine(
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'--proxy 127.0.0.1:{0} "http://www.example.com/from_path/hello?=foo=bar" '
- '-H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port))
+ '-H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -70,7 +71,7 @@ ts.Disk.traffic_out.Content = "gold/header_rewrite-tag.gold"
# Test TO-URL in a set-redirect operator.
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--head 127.0.0.1:{0} -H "Host: no_path.com" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand('--head 127.0.0.1:{0} -H "Host: no_path.com" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/set-redirect.gold"
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url_glob.test.py b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url_glob.test.py
index 18b5577878..a2f9aa5ab8 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url_glob.test.py
+++ b/tests/gold_tests/pluginTest/header_rewrite/header_rewrite_url_glob.test.py
@@ -47,7 +47,7 @@ ts.Disk.plugin_config.AddLine(f'header_rewrite.so {Test.RunDirectory}/glob_set_r
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(ts)
tr.Processes.Default.StartBefore(server)
-tr.MakeCurlCommand(f'--head 127.0.0.1:{ts.Variables.port} -H "Host: 127.0.0.1:{server.Variables.Port}" --verbose')
+tr.MakeCurlCommand(f'--head 127.0.0.1:{ts.Variables.port} -H "Host: 127.0.0.1:{server.Variables.Port}" --verbose', ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/set-redirect-glob.gold"
tr.StillRunningAfter = server
@@ -56,7 +56,7 @@ ts.Disk.traffic_out.Content = "gold/header_rewrite-tag.gold"
# Run operator on Send Response Hdr hook (ID:REQUEST == 1).
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f'--head 127.0.0.1:{ts.Variables.port} -H "Host: 127.0.0.1:{server.Variables.Port}" --verbose')
+tr.MakeCurlCommand(f'--head 127.0.0.1:{ts.Variables.port} -H "Host: 127.0.0.1:{server.Variables.Port}" --verbose', ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/set-redirect-glob.gold"
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/pluginTest/healthchecks/healthchecks.test.py b/tests/gold_tests/pluginTest/healthchecks/healthchecks.test.py
index a0709c854a..fb36c1d954 100644
--- a/tests/gold_tests/pluginTest/healthchecks/healthchecks.test.py
+++ b/tests/gold_tests/pluginTest/healthchecks/healthchecks.test.py
@@ -88,7 +88,7 @@ class TestFileChangeBehavior:
self._positive_hc_counter += 1
counter = self._positive_hc_counter
tr = Test.AddTestRun(f'Positive acme healthchecks: {counter}')
- tr.MakeCurlCommand(f'-v http://127.0.0.1:{self._ts.Variables.port}/acme')
+ tr.MakeCurlCommand(f'-v http://127.0.0.1:{self._ts.Variables.port}/acme', ts=self._ts)
curl_acme = tr.Processes.Default
if not self._ts_started:
curl_acme.StartBefore(self._ts)
@@ -97,7 +97,7 @@ class TestFileChangeBehavior:
# Repeat for acme-ssl
tr2 = Test.AddTestRun(f'Positive acme-ssl healthchecks: {counter}')
- tr2.MakeCurlCommand(f'-kv https://127.0.0.1:{self._ts.Variables.ssl_port}/acme-ssl')
+ tr2.MakeCurlCommand(f'-kv https://127.0.0.1:{self._ts.Variables.ssl_port}/acme-ssl', ts=self._ts)
curl_acme_ssl = tr2.Processes.Default
if not self._ts_started:
curl_acme_ssl.StartBefore(self._ts)
@@ -118,7 +118,7 @@ class TestFileChangeBehavior:
:return: None
'''
tr = Test.AddTestRun('Expect 200 for acme after acme-ssl removal')
- tr.MakeCurlCommand(f'-v http://127.0.0.1:{self._ts.Variables.port}/acme')
+ tr.MakeCurlCommand(f'-v http://127.0.0.1:{self._ts.Variables.port}/acme', ts=self._ts)
curl_acme = tr.Processes.Default
if not self._ts_started:
curl_acme.StartBefore(self._ts)
@@ -126,7 +126,7 @@ class TestFileChangeBehavior:
curl_acme.Streams.All += Testers.ContainsExpression('HTTP/1.1 200', 'Verify 200 response for /acme after acme-ssl removal')
tr2 = Test.AddTestRun('Expect 404 for acme-ssl after removal')
- tr2.MakeCurlCommand(f'-kv https://127.0.0.1:{self._ts.Variables.ssl_port}/acme-ssl')
+ tr2.MakeCurlCommand(f'-kv https://127.0.0.1:{self._ts.Variables.ssl_port}/acme-ssl', ts=self._ts)
curl_acme_ssl = tr2.Processes.Default
if not self._ts_started:
curl_acme_ssl.StartBefore(self._ts)
diff --git a/tests/gold_tests/pluginTest/ja4_fingerprint/ja4_fingerprint.test.py b/tests/gold_tests/pluginTest/ja4_fingerprint/ja4_fingerprint.test.py
index 0b3eb0ace0..c235a82261 100644
--- a/tests/gold_tests/pluginTest/ja4_fingerprint/ja4_fingerprint.test.py
+++ b/tests/gold_tests/pluginTest/ja4_fingerprint/ja4_fingerprint.test.py
@@ -144,7 +144,7 @@ class TestJA4Fingerprint:
'then a JA4 header should be attached.')
def test1(params: TestParams) -> None:
client = params['tr'].Processes.Default
- params['tr'].MakeCurlCommand('-k -v "https://localhost:{0}/resource"'.format(params['port_one']))
+ params['tr'].MakeCurlCommand('-k -v "https://localhost:{0}/resource"'.format(params['port_one']), ts=params['ts'])
client.ReturnCode = 0
client.Streams.stdout += Testers.ContainsExpression(r'Yay!', 'We should receive the expected body.')
diff --git a/tests/gold_tests/pluginTest/lua/lua_client_hook.test.py b/tests/gold_tests/pluginTest/lua/lua_client_hook.test.py
index ef447943df..74b8678979 100644
--- a/tests/gold_tests/pluginTest/lua/lua_client_hook.test.py
+++ b/tests/gold_tests/pluginTest/lua/lua_client_hook.test.py
@@ -50,7 +50,7 @@ ts.Disk.traffic_out.Content = Testers.ContainsExpression(r"AAAA", "Response is p
# Test if watermark upstream is set
tr = Test.AddTestRun("Lua Response Client Hook")
-tr.MakeCurlCommand("-v http://127.0.0.1:{0}".format(ts.Variables.port))
+tr.MakeCurlCommand("-v http://127.0.0.1:{0}".format(ts.Variables.port), ts=ts)
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(ts)
diff --git a/tests/gold_tests/pluginTest/lua/lua_debug_tags.test.py b/tests/gold_tests/pluginTest/lua/lua_debug_tags.test.py
index 1e7b611d2b..1d4bd3812d 100644
--- a/tests/gold_tests/pluginTest/lua/lua_debug_tags.test.py
+++ b/tests/gold_tests/pluginTest/lua/lua_debug_tags.test.py
@@ -46,6 +46,6 @@ tr = Test.AddTestRun("check tags")
ps = tr.Processes.Default
tr.StillRunningAfter = ts
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommandMulti(f"bash ./tags.sh {curl_and_args}")
+tr.MakeCurlCommandMulti(f"bash ./tags.sh {curl_and_args}", ts=ts)
ps.Env = ts.Env
ps.ReturnCode = 0
diff --git a/tests/gold_tests/pluginTest/lua/lua_header_table.test.py b/tests/gold_tests/pluginTest/lua/lua_header_table.test.py
index 73c8dc7f86..50a8c355e1 100644
--- a/tests/gold_tests/pluginTest/lua/lua_header_table.test.py
+++ b/tests/gold_tests/pluginTest/lua/lua_header_table.test.py
@@ -34,7 +34,7 @@ ts.Setup.Copy("header_table.lua", ts.Variables.CONFIGDIR)
tr = Test.AddTestRun("Lua Header Table")
ps = tr.Processes.Default # alias
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(f"-s -D /dev/stderr -H 'X-Test: test1' -H 'X-Test: test2' http://127.0.0.1:{ts.Variables.port}")
+tr.MakeCurlCommand(f"-s -D /dev/stderr -H 'X-Test: test1' -H 'X-Test: test2' http://127.0.0.1:{ts.Variables.port}", ts=ts)
ps.Env = ts.Env
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("test1test2", "expected header table results")
diff --git a/tests/gold_tests/pluginTest/lua/lua_states_stats.test.py b/tests/gold_tests/pluginTest/lua/lua_states_stats.test.py
index 0e79852c1b..f4a1713e07 100644
--- a/tests/gold_tests/pluginTest/lua/lua_states_stats.test.py
+++ b/tests/gold_tests/pluginTest/lua/lua_states_stats.test.py
@@ -74,7 +74,7 @@ tr.StillRunningAfter = ts
# 1 Test - Exercise lua script
tr = Test.AddTestRun("Lua hello")
ps = tr.Processes.Default # alias
-tr.MakeCurlCommand(curl_and_args + ' http://hello/hello')
+tr.MakeCurlCommand(curl_and_args + ' http://hello/hello', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr.Content = Testers.ContainsExpression("Hello, World", "hello world content")
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/lua/lua_watermark.test.py b/tests/gold_tests/pluginTest/lua/lua_watermark.test.py
index ca82e1fba8..d2c1bddc24 100644
--- a/tests/gold_tests/pluginTest/lua/lua_watermark.test.py
+++ b/tests/gold_tests/pluginTest/lua/lua_watermark.test.py
@@ -49,7 +49,7 @@ ts.Disk.traffic_out.Content = Testers.ContainsExpression(r"WMbytes\(31337\)", "U
# Test if watermark upstream is set
tr = Test.AddTestRun("Lua Watermark")
-tr.MakeCurlCommand("-v http://127.0.0.1:{0}".format(ts.Variables.port))
+tr.MakeCurlCommand("-v http://127.0.0.1:{0}".format(ts.Variables.port), ts=ts)
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(ts)
diff --git a/tests/gold_tests/pluginTest/money_trace/money_trace.test.py b/tests/gold_tests/pluginTest/money_trace/money_trace.test.py
index b0a656d6af..25bca70dd1 100644
--- a/tests/gold_tests/pluginTest/money_trace/money_trace.test.py
+++ b/tests/gold_tests/pluginTest/money_trace/money_trace.test.py
@@ -78,7 +78,7 @@ tr = Test.AddTestRun("no plugin test")
ps = tr.Processes.Default
ps.StartBefore(server)
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + " http://none/path")
+tr.MakeCurlCommand(curl_and_args + " http://none/path", ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -86,7 +86,7 @@ tr.StillRunningAfter = server
# 1 Test
tr = Test.AddTestRun("basic config, no money trace client header")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + " http://basic/path")
+tr.MakeCurlCommand(curl_and_args + " http://basic/path", ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -99,7 +99,7 @@ def maketrace(name):
# 2 Test
tr = Test.AddTestRun("basic config, money trace client header")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://basic/path -H "X-MoneyTrace: ' + maketrace("basic") + '"')
+tr.MakeCurlCommand(curl_and_args + ' http://basic/path -H "X-MoneyTrace: ' + maketrace("basic") + '"', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -107,7 +107,7 @@ tr.StillRunningAfter = server
# 3 Test
tr = Test.AddTestRun("header config, mt client header")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://header/path -H "mt: ' + maketrace("header") + '"')
+tr.MakeCurlCommand(curl_and_args + ' http://header/path -H "mt: ' + maketrace("header") + '"', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -115,7 +115,7 @@ tr.StillRunningAfter = server
# 4 Test
tr = Test.AddTestRun("pregen config, but no header passed in")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://pregen/path')
+tr.MakeCurlCommand(curl_and_args + ' http://pregen/path', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -123,7 +123,7 @@ tr.StillRunningAfter = server
# 5 Test
tr = Test.AddTestRun("pregen config, money trace client header")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://pregen/path -H "X-MoneyTrace: ' + maketrace("pregen") + '"')
+tr.MakeCurlCommand(curl_and_args + ' http://pregen/path -H "X-MoneyTrace: ' + maketrace("pregen") + '"', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -131,7 +131,7 @@ tr.StillRunningAfter = server
# 6 Test
tr = Test.AddTestRun("pregen config, mt client header")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://pgh/path -H "mt: ' + maketrace("pgh") + '"')
+tr.MakeCurlCommand(curl_and_args + ' http://pgh/path -H "mt: ' + maketrace("pgh") + '"', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -139,7 +139,7 @@ tr.StillRunningAfter = server
# 7 Test
tr = Test.AddTestRun("create config, money trace client header")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://create/path')
+tr.MakeCurlCommand(curl_and_args + ' http://create/path', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -147,7 +147,7 @@ tr.StillRunningAfter = server
# 8 Test
tr = Test.AddTestRun("create config, mt client header")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://cheader/path')
+tr.MakeCurlCommand(curl_and_args + ' http://cheader/path', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -155,7 +155,7 @@ tr.StillRunningAfter = server
# 9 Test
tr = Test.AddTestRun("create config, pregen client header")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://cpregen/path')
+tr.MakeCurlCommand(curl_and_args + ' http://cpregen/path', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -163,7 +163,7 @@ tr.StillRunningAfter = server
# 10 Test
tr = Test.AddTestRun("passthru mode")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://passthru/path -H "X-MoneyTrace: ' + maketrace("passthru") + '"')
+tr.MakeCurlCommand(curl_and_args + ' http://passthru/path -H "X-MoneyTrace: ' + maketrace("passthru") + '"', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -183,7 +183,7 @@ trace_strings = [
for trace in trace_strings:
tr = Test.AddTestRun(trace)
ps = tr.Processes.Default
- tr.MakeCurlCommand(curl_and_args + ' http://pregen/path -H "X-MoneyTrace: ' + trace + '"')
+ tr.MakeCurlCommand(curl_and_args + ' http://pregen/path -H "X-MoneyTrace: ' + trace + '"', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -192,7 +192,7 @@ for trace in trace_strings:
for trace in trace_strings:
tr = Test.AddTestRun(trace)
ps = tr.Processes.Default
- tr.MakeCurlCommand(curl_and_args + ' http://cpregen/path -H "X-MoneyTrace: ' + trace + '"')
+ tr.MakeCurlCommand(curl_and_args + ' http://cpregen/path -H "X-MoneyTrace: ' + trace + '"', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/pluginTest/money_trace/money_trace_global.test.py b/tests/gold_tests/pluginTest/money_trace/money_trace_global.test.py
index 140cfce67a..7f91c29d06 100644
--- a/tests/gold_tests/pluginTest/money_trace/money_trace_global.test.py
+++ b/tests/gold_tests/pluginTest/money_trace/money_trace_global.test.py
@@ -77,7 +77,7 @@ tr = Test.AddTestRun("normal header test")
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' http://ats/path -H "MoneyTrace: ' + clientvalue + '"')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/path -H "MoneyTrace: ' + clientvalue + '"', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -85,7 +85,7 @@ tr.StillRunningAfter = server
# 1 Test
tr = Test.AddTestRun("skip plugin test - pregen will still be set")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://ats/path -H "Skip-Global-MoneyTrace: true"')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/path -H "Skip-Global-MoneyTrace: true"', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
@@ -93,7 +93,7 @@ tr.StillRunningAfter = server
# 2 Test
tr = Test.AddTestRun("create header test")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://ats/path')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/path', ts=ts)
ps.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/pluginTest/origin_server_auth/origin_server_auth.test.py b/tests/gold_tests/pluginTest/origin_server_auth/origin_server_auth.test.py
index 22f8014431..5e6231f585 100644
--- a/tests/gold_tests/pluginTest/origin_server_auth/origin_server_auth.test.py
+++ b/tests/gold_tests/pluginTest/origin_server_auth/origin_server_auth.test.py
@@ -97,7 +97,7 @@ class OriginServerAuthTest:
Test s3 v4 origin server
'''
tr = Test.AddTestRun()
- tr.MakeCurlCommand(f'-s -v -H "Host: www.example.com" http://127.0.0.1:{self.ts.Variables.port}/s3-bucket;')
+ tr.MakeCurlCommand(f'-s -v -H "Host: www.example.com" http://127.0.0.1:{self.ts.Variables.port}/s3-bucket;', ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(self.server)
tr.Processes.Default.StartBefore(self.ts)
@@ -110,7 +110,7 @@ class OriginServerAuthTest:
Test GCP origin server
'''
tr = Test.AddTestRun()
- tr.MakeCurlCommand(f'-s -v -H "Host: www.example.com" http://127.0.0.1:{self.ts.Variables.port}/gcp;')
+ tr.MakeCurlCommand(f'-s -v -H "Host: www.example.com" http://127.0.0.1:{self.ts.Variables.port}/gcp;', ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr.Content = Testers.ContainsExpression("200 OK", "expected 200 response")
tr.Processes.Default.Streams.stderr.Content += Testers.ContainsExpression("Content-Length: 8", "expected content-length 8")
diff --git a/tests/gold_tests/pluginTest/polite_hook_wait/curl.gold b/tests/gold_tests/pluginTest/polite_hook_wait/curl.gold
index 049e84e196..d39edb08c6 100644
--- a/tests/gold_tests/pluginTest/polite_hook_wait/curl.gold
+++ b/tests/gold_tests/pluginTest/polite_hook_wait/curl.gold
@@ -1,2 +1,3 @@
+``
> GET / HTTP/1.1
`` HTTP/1.1 403 Forbidden
diff --git a/tests/gold_tests/pluginTest/polite_hook_wait/polite_hook_wait.test.py b/tests/gold_tests/pluginTest/polite_hook_wait/polite_hook_wait.test.py
index 0a57285d91..c43ce842fd 100644
--- a/tests/gold_tests/pluginTest/polite_hook_wait/polite_hook_wait.test.py
+++ b/tests/gold_tests/pluginTest/polite_hook_wait/polite_hook_wait.test.py
@@ -47,14 +47,20 @@ ts.Disk.plugin_config.AddLine(f"{plugin_name}.so")
ts.Disk.remap_config.AddLine("map http://myhost.test http://127.0.0.1:{0}".format(server.Variables.Port))
+ipv4flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
+
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
-tr.MakeCurlCommand('--verbose --ipv4 --header "Host:myhost.test" http://localhost:{}/ 2>curl.txt'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '--verbose {0} --header "Host:myhost.test" http://localhost:{1}/ 2>curl.txt'.format(ipv4flag, ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--verbose --ipv4 --header "Host:myhost.test" http://localhost:{}/ 2>curl.txt'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '--verbose {0} --header "Host:myhost.test" http://localhost:{1}/ 2>curl.txt'.format(ipv4flag, ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.gold b/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.gold
index 0cb9cc380c..7d9890b5ad 100644
--- a/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.gold
+++ b/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.gold
@@ -1,4 +1,4 @@
-GET http://domain.in/texts/demo-3842948374928374982374982374.txt HTTP/1.1
+GET http://``/texts/demo-3842948374928374982374982374.txt HTTP/1.1
GET http://domain.in/texts/demo-3842948374928374982374982375.txt HTTP/1.1
GET http://domain.in/texts/demo-3842948374928374982374982376.txt HTTP/1.1
GET http://domain.in/texts/demo-3842948374928374982374982377.txt HTTP/1.1
diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py b/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py
index 264689a959..bd4cd2bf74 100644
--- a/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py
+++ b/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py
@@ -67,12 +67,13 @@ tr.Processes.Default.Command = 'echo start TS, HTTP server and DNS.'
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://domain.in/texts/demo-3842948374928374982374982374.txt')
+tr.MakeCurlCommand(
+ f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://domain.in/texts/demo-3842948374928374982374982374.txt', ts=ts)
tr.Processes.Default.ReturnCode = 0
Test.AddAwaitFileContainsTestRun('Await transactions to finish logging.', ts.Disk.traffic_out.Name, '3842948374928374982374982377')
tr = Test.AddTestRun()
-tr.Processes.Default.Command = (f"grep 'GET http://domain.in' {ts.Disk.traffic_out.Name}")
+tr.Processes.Default.Command = (f"grep 'GET http://' {ts.Disk.traffic_out.Name} | grep -v '127.0.0.1' ")
tr.Streams.stdout = "prefetch_bignum.gold"
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py b/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py
index 702c3be0bf..cca600daad 100644
--- a/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py
+++ b/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py
@@ -165,7 +165,7 @@ origin.addResponse("sessionlog.json", request_header, response_header)
dns = Test.MakeDNServer("dns")
# next hop trafficserver instance
-ts1 = Test.MakeATSProcess("ts1")
+ts1 = Test.MakeATSProcess("ts1", enable_uds=False)
ts1.Disk.records_config.update(
{
'proxy.config.diags.debug.enabled': 1,
@@ -227,50 +227,50 @@ tr.Processes.Default.ReturnCode = 0
# attempt to get normal asset
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} http://ts0/tests/{asset_name}")
+tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} http://ts0/tests/{asset_name}", ts=ts0)
tr.Processes.Default.ReturnCode = 0
# issue curl form same asset, with prefetch
tr = Test.AddTestRun()
tr.DelayStart = 1
-tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} http://ts0/tests/{asset_name} -H \'{pf_header}\'")
+tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} http://ts0/tests/{asset_name} -H \'{pf_header}\'", ts=ts0)
tr.Processes.Default.ReturnCode = 0
# fetch the prefetched asset (only cached on ts1)
tr = Test.AddTestRun()
tr.DelayStart = 1
-tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} http://ts0/tests/{pf_name}")
+tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} http://ts0/tests/{pf_name}", ts=ts0)
tr.Processes.Default.ReturnCode = 0
# attempt to prefetch again
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} http://ts0/tests/{asset_name} -H \'{pf_header}\'")
+tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} http://ts0/tests/{asset_name} -H \'{pf_header}\'", ts=ts0)
tr.Processes.Default.ReturnCode = 0
# request the prefetched asset
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} http://ts0/tests/{pf_name}")
+tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} http://ts0/tests/{pf_name}", ts=ts0)
tr.Processes.Default.ReturnCode = 0
# prefetch using query params with query prefetch perc encoded
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} \'http://ts0/tests/{query_name}\' -H \'{query_pf_perc_header}\'")
+ f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} \'http://ts0/tests/{query_name}\' -H \'{query_pf_perc_header}\'", ts=ts0)
tr.Processes.Default.ReturnCode = 0
# request the prefetched asset without perc encoding
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} \'http://ts0/tests/{query_pf_name}\'")
+tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} \'http://ts0/tests/{query_pf_name}\'", ts=ts0)
tr.Processes.Default.ReturnCode = 0
# ensure root path prefetch works
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} \'http://ts0/{root_name}\' -H \'{root_header}\'")
+tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} \'http://ts0/{root_name}\' -H \'{root_header}\'", ts=ts0)
tr.Processes.Default.ReturnCode = 0
# ensure request with nrr= field is skipped
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} \'http://ts0/{crr_name}\' -H \'{crr_header}\'")
+tr.MakeCurlCommand(f"--verbose --proxy 127.0.0.1:{ts0.Variables.port} \'http://ts0/{crr_name}\' -H \'{crr_header}\'", ts=ts0)
tr.Processes.Default.ReturnCode = 0
condwaitpath = os.path.join(Test.Variables.AtsTestToolsDir, 'condwait')
diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.gold b/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.gold
index 68cdadc2ef..08fa1800a3 100644
--- a/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.gold
+++ b/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.gold
@@ -1,4 +1,4 @@
-GET http://domain.in/texts/demo-3594967639391.txt HTTP/1.1
+GET http://``/texts/demo-3594967639391.txt HTTP/1.1
GET http://domain.in/texts/demo-3594967639392.txt HTTP/1.1
GET http://domain.in/texts/demo-3594967639393.txt HTTP/1.1
GET http://domain.in/texts/demo-3594967639394.txt HTTP/1.1
diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py b/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py
index 8889f85478..a3c4538023 100644
--- a/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py
+++ b/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py
@@ -64,12 +64,12 @@ tr.Processes.Default.Command = 'echo start TS, HTTP server and DNS.'
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://domain.in/texts/demo-3594967639391.txt')
+tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://domain.in/texts/demo-3594967639391.txt', ts=ts)
tr.Processes.Default.ReturnCode = 0
Test.AddAwaitFileContainsTestRun('Await transactions to finish logging.', ts.Disk.traffic_out.Name, '3594967639394')
tr = Test.AddTestRun()
-tr.Processes.Default.Command = (f"grep 'GET http://domain.in' {ts.Disk.traffic_out.Name}")
+tr.Processes.Default.Command = (f"grep 'GET http://' {ts.Disk.traffic_out.Name} | grep -v '127.0.0.1'")
tr.Streams.stdout = "prefetch_overflow.gold"
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_simple.gold b/tests/gold_tests/pluginTest/prefetch/prefetch_simple.gold
index 56638a70d8..fcc69e218d 100644
--- a/tests/gold_tests/pluginTest/prefetch/prefetch_simple.gold
+++ b/tests/gold_tests/pluginTest/prefetch/prefetch_simple.gold
@@ -1,4 +1,4 @@
-GET http://domain.in/texts/demo-1.txt HTTP/1.1
+GET http://``/texts/demo-1.txt HTTP/1.1
GET http://domain.in/texts/demo-2.txt HTTP/1.1
GET http://domain.in/texts/demo-3.txt HTTP/1.1
GET http://domain.in/texts/demo-4.txt HTTP/1.1
diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py b/tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py
index f3fdace800..a171c65db7 100644
--- a/tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py
+++ b/tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py
@@ -64,12 +64,12 @@ tr.Processes.Default.Command = 'echo start TS, HTTP server and DNS.'
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://domain.in/texts/demo-1.txt')
+tr.MakeCurlCommand(f'--verbose --proxy 127.0.0.1:{ts.Variables.port} http://domain.in/texts/demo-1.txt', ts=ts)
tr.Processes.Default.ReturnCode = 0
Test.AddAwaitFileContainsTestRun('Await transactions to finish logging.', ts.Disk.traffic_out.Name, 'demo-4.txt')
tr = Test.AddTestRun()
-tr.Processes.Default.Command = (f"grep 'GET http://domain.in' {ts.Disk.traffic_out.Name}")
+tr.Processes.Default.Command = (f"grep 'GET http://' {ts.Disk.traffic_out.Name} | grep -v '127.0.0.1'")
tr.Streams.stdout = "prefetch_simple.gold"
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/pluginTest/regex_remap/regex_remap.test.py b/tests/gold_tests/pluginTest/regex_remap/regex_remap.test.py
index b32bf40cc7..12e3b9867e 100644
--- a/tests/gold_tests/pluginTest/regex_remap/regex_remap.test.py
+++ b/tests/gold_tests/pluginTest/regex_remap/regex_remap.test.py
@@ -93,7 +93,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(nameserver)
tr.Processes.Default.StartBefore(Test.Processes.ts)
creq = replay_txns[0]['client-request']
-tr.MakeCurlCommand(curl_and_args + '--header "uuid: {}" '.format(creq["headers"]["fields"][1][1]) + creq["url"])
+tr.MakeCurlCommand(curl_and_args + '--header "uuid: {}" '.format(creq["headers"]["fields"][1][1]) + creq["url"], ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/regex_remap_smoke.gold"
tr.StillRunningAfter = ts
@@ -102,7 +102,8 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("pristine test")
tr.MakeCurlCommand(
curl_and_args + "'http://example.two/alpha/bravo/?action=newsfed;param0001=00003E;param0002=00004E;param0003=00005E'" +
- f" | grep -e '^HTTP/' -e '^Location' | sed 's/{server.Variables.Port}/SERVER_PORT/'")
+ f" | grep -e '^HTTP/' -e '^Location' | sed 's/{server.Variables.Port}/SERVER_PORT/'",
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/regex_remap_redirect.gold"
tr.StillRunningAfter = ts
@@ -112,7 +113,8 @@ tr = Test.AddTestRun("2nd pristine test")
tr.MakeCurlCommand(
curl_and_args + '--header "uuid: {}" '.format(creq["headers"]["fields"][1][1]) +
" 'http://example.three/alpha/bravo/?action=newsfed;param0001=00003E;param0002=00004E;param0003=00005E'" +
- " | grep -e '^HTTP/' -e '^Content-Length'")
+ " | grep -e '^HTTP/' -e '^Content-Length'",
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/regex_remap_simple.gold"
tr.StillRunningAfter = ts
@@ -121,7 +123,7 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("crash test")
creq = replay_txns[1]['client-request']
tr.MakeCurlCommand(curl_and_args + \
- '--header "uuid: {}" '.format(creq["headers"]["fields"][1][1]) + '"{}"'.format(creq["url"]))
+ '--header "uuid: {}" '.format(creq["headers"]["fields"][1][1]) + '"{}"'.format(creq["url"]), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/regex_remap_crash.gold"
ts.Disk.diags_log.Content = Testers.ContainsExpression(
diff --git a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py
index adc9291ed1..d497ecfc20 100644
--- a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py
+++ b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py
@@ -136,7 +136,7 @@ ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1'.format(ts.Variables.port))
+tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1'.format(ts.Variables.port), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss response")
tr.StillRunningAfter = ts
@@ -144,7 +144,7 @@ tr.StillRunningAfter = ts
# 1 Test - Load cache (miss) for later test (path1a)
tr = Test.AddTestRun("Cache miss path1a")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1a'.format(ts.Variables.port))
+tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1a'.format(ts.Variables.port), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss response")
tr.StillRunningAfter = ts
@@ -152,7 +152,7 @@ tr.StillRunningAfter = ts
# 2 Test - Load cache (miss) for later test (path2a)
tr = Test.AddTestRun("Cache miss path2a")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path2a'.format(ts.Variables.port))
+tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path2a'.format(ts.Variables.port), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss response")
tr.StillRunningAfter = ts
@@ -160,7 +160,7 @@ tr.StillRunningAfter = ts
# 3 Test - Cache hit path1
tr = Test.AddTestRun("Cache hit fresh path1")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1'.format(ts.Variables.port))
+tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1'.format(ts.Variables.port), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-fresh", "expected cache hit fresh response")
tr.StillRunningAfter = ts
@@ -186,7 +186,7 @@ tr.TimeOut = 5
tr = Test.AddTestRun("Revalidate stale path1")
ps = tr.Processes.Default
tr.DelayStart = 5
-tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1'.format(ts.Variables.port))
+tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1'.format(ts.Variables.port), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-stale", "expected cache hit stale response")
tr.StillRunningAfter = ts
@@ -194,7 +194,7 @@ tr.StillRunningAfter = ts
# 6 Test - Cache hit (path1)
tr = Test.AddTestRun("Cache hit fresh path1")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1'.format(ts.Variables.port))
+tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1'.format(ts.Variables.port), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-fresh", "expected cache hit fresh response")
tr.StillRunningAfter = ts
@@ -221,7 +221,7 @@ tr.TimeOut = 5
tr = Test.AddTestRun("Cache hit fresh path1")
tr.DelayStart = 5
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1'.format(ts.Variables.port))
+tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1'.format(ts.Variables.port), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-fresh", "expected cache hit fresh response")
tr.StillRunningAfter = ts
@@ -229,7 +229,7 @@ tr.StillRunningAfter = ts
# 9 Test - Cache stale (check rule is still loaded) (path1a)
tr = Test.AddTestRun("Revalidate stale path1a")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1a'.format(ts.Variables.port))
+tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path1a'.format(ts.Variables.port), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-stale", "expected cache hit stale response")
tr.StillRunningAfter = ts
@@ -259,7 +259,7 @@ tr.TimeOut = 5
tr = Test.AddTestRun("Cache hit stale path2a")
tr.DelayStart = 5
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path2a'.format(ts.Variables.port))
+tr.MakeCurlCommand(curl_and_args + ' http://127.0.0.1:{}/path2a'.format(ts.Variables.port), ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-stale", "expected cache hit stale response")
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_miss.test.py b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_miss.test.py
index 788c8a2361..96ba108f14 100644
--- a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_miss.test.py
+++ b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate_miss.test.py
@@ -101,7 +101,7 @@ tr = Test.AddTestRun("Cache miss path1")
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' http://ats/path1')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/path1', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss response")
tr.StillRunningAfter = ts
@@ -109,7 +109,7 @@ tr.StillRunningAfter = ts
# 1 Request, cache hit expected
tr = Test.AddTestRun("Cache hit fresh path1")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://ats/path1')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/path1', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-fresh", "expected cache hit fresh response")
tr.StillRunningAfter = ts
@@ -133,7 +133,7 @@ tr.DelayStart = 1
tr = Test.AddTestRun("Revalidate MISS path1")
ps = tr.Processes.Default
tr.DelayStart = 7
-tr.MakeCurlCommand(curl_and_args + ' http://ats/path1')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/path1', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss response")
tr.StillRunningAfter = ts
@@ -141,7 +141,7 @@ tr.StillRunningAfter = ts
# 4 Request, cache hit (path1)
tr = Test.AddTestRun("Cache hit fresh path1")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://ats/path1')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/path1', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-fresh", "expected cache hit fresh response")
tr.StillRunningAfter = ts
@@ -164,7 +164,7 @@ tr.DelayStart = 1
tr = Test.AddTestRun("Cache stale path1")
ps = tr.Processes.Default
tr.DelayStart = 7
-tr.MakeCurlCommand(curl_and_args + ' http://ats/path1')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/path1', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-stale", "expected cache hit stale response")
tr.StillRunningAfter = ts
@@ -187,7 +187,7 @@ tr.DelayStart = 1
tr = Test.AddTestRun("Cache mis path1")
ps = tr.Processes.Default
tr.DelayStart = 7
-tr.MakeCurlCommand(curl_and_args + ' http://ats/path1')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/path1', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: miss", "expected cache miss response")
tr.StillRunningAfter = ts
@@ -196,7 +196,7 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("Cache hit path1")
ps = tr.Processes.Default
tr.DelayStart = 5
-tr.MakeCurlCommand(curl_and_args + ' http://ats/path1')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/path1', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-fresh", "expected cache hit response")
tr.StillRunningAfter = ts
@@ -217,7 +217,7 @@ tr.DelayStart = 1
tr = Test.AddTestRun("Cache hit path1")
ps = tr.Processes.Default
tr.DelayStart = 7
-tr.MakeCurlCommand(curl_and_args + ' http://ats/path1')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/path1', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-fresh", "expected cache hit response")
tr.StillRunningAfter = ts
@@ -237,7 +237,7 @@ tr.TimeOut = 5
tr = Test.AddTestRun("Cache hit path1")
ps = tr.Processes.Default
tr.DelayStart = 5
-tr.MakeCurlCommand(curl_and_args + ' http://ats/path1')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/path1', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Cache: hit-fresh", "expected cache hit response")
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/remap_stats/remap_stats.test.py b/tests/gold_tests/pluginTest/remap_stats/remap_stats.test.py
index c7b3b875f1..0827fc49b2 100644
--- a/tests/gold_tests/pluginTest/remap_stats/remap_stats.test.py
+++ b/tests/gold_tests/pluginTest/remap_stats/remap_stats.test.py
@@ -46,14 +46,14 @@ ts.Disk.records_config.update(
tr = Test.AddTestRun("curl host one")
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand('-o /dev/null -H "Host: one"' + ' http://127.0.0.1:{}/argh'.format(ts.Variables.port))
+tr.MakeCurlCommand('-o /dev/null -H "Host: one"' + ' http://127.0.0.1:{}/argh'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
# 1 Test - Curl host Two
tr = Test.AddTestRun("curl host two")
-tr.MakeCurlCommand('-o /dev/null -H "Host: two"' + ' http://127.0.0.1:{}/badpath'.format(ts.Variables.port))
+tr.MakeCurlCommand('-o /dev/null -H "Host: two"' + ' http://127.0.0.1:{}/badpath'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/pluginTest/remap_stats/remap_stats_post.test.py b/tests/gold_tests/pluginTest/remap_stats/remap_stats_post.test.py
index b72cf79328..a0fcf1c2b6 100644
--- a/tests/gold_tests/pluginTest/remap_stats/remap_stats_post.test.py
+++ b/tests/gold_tests/pluginTest/remap_stats/remap_stats_post.test.py
@@ -46,14 +46,14 @@ ts.Disk.records_config.update(
tr = Test.AddTestRun("curl host one")
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand('-o /dev/null -H "Host: one"' + ' http://127.0.0.1:{}/argh'.format(ts.Variables.port))
+tr.MakeCurlCommand('-o /dev/null -H "Host: one"' + ' http://127.0.0.1:{}/argh'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
# 1 Test - Curl host Two
tr = Test.AddTestRun("curl host two")
-tr.MakeCurlCommand('-o /dev/null -H "Host: two"' + ' http://127.0.0.1:{}/badpath'.format(ts.Variables.port))
+tr.MakeCurlCommand('-o /dev/null -H "Host: two"' + ' http://127.0.0.1:{}/badpath'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/pluginTest/slice/slice.test.py b/tests/gold_tests/pluginTest/slice/slice.test.py
index 30ddff4973..03d0079b81 100644
--- a/tests/gold_tests/pluginTest/slice/slice.test.py
+++ b/tests/gold_tests/pluginTest/slice/slice.test.py
@@ -89,7 +89,7 @@ tr = Test.AddTestRun("Fetch first slice range")
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' http://preload/path')
+tr.MakeCurlCommand(curl_and_args + ' http://preload/path', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_200.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK response")
@@ -98,7 +98,7 @@ tr.StillRunningAfter = ts
# 1 Test - First complete slice
tr = Test.AddTestRun("Fetch first slice range")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r 0-6')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r 0-6', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_first.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 response")
@@ -108,7 +108,7 @@ tr.StillRunningAfter = ts
# 2 Test - Last slice auto
tr = Test.AddTestRun("Last slice -- 14-")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r 14-')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r 14-', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_last.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 response")
@@ -118,7 +118,7 @@ tr.StillRunningAfter = ts
# 3 Test - Last slice exact
tr = Test.AddTestRun("Last slice 14-17")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r 14-17')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r 14-17', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_last.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 response")
@@ -128,7 +128,7 @@ tr.StillRunningAfter = ts
# 4 Test - Last slice truncated
tr = Test.AddTestRun("Last truncated slice 14-20")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r 14-20')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r 14-20', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_last.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 response")
@@ -138,7 +138,7 @@ tr.StillRunningAfter = ts
# 5 Test - Whole asset via slices
tr = Test.AddTestRun("Whole asset via slices")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/path')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/path', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_200.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK response")
@@ -147,7 +147,7 @@ tr.StillRunningAfter = ts
# 6 Test - Whole asset via range
tr = Test.AddTestRun("Whole asset via range")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r 0-')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r 0-', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_206.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 response")
@@ -157,7 +157,7 @@ tr.StillRunningAfter = ts
# 7 Test - Non aligned slice request
tr = Test.AddTestRun("Non aligned slice request")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r 5-16')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r 5-16', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_mid.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 response")
@@ -169,7 +169,7 @@ tr = Test.AddTestRun("Invalid end range request, 416")
beg = len(body) + 1
end = beg + block_bytes
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r {}-{}'.format(beg, end))
+tr.MakeCurlCommand(curl_and_args + ' http://slice/path' + ' -r {}-{}'.format(beg, end), ts=ts)
ps.Streams.stdout.Content = Testers.ContainsExpression("416 Requested Range Not Satisfiable", "expected 416 response")
tr.StillRunningAfter = ts
@@ -177,7 +177,7 @@ tr.StillRunningAfter = ts
# if this fails it will infinite loop
tr = Test.AddTestRun("Fetch first slice range")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slicehdr/path' + ' -r 0-6')
+tr.MakeCurlCommand(curl_and_args + ' http://slicehdr/path' + ' -r 0-6', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_first.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 response")
diff --git a/tests/gold_tests/pluginTest/slice/slice_conditional.test.py b/tests/gold_tests/pluginTest/slice/slice_conditional.test.py
index 023cd494c5..27f4c0a64f 100644
--- a/tests/gold_tests/pluginTest/slice/slice_conditional.test.py
+++ b/tests/gold_tests/pluginTest/slice/slice_conditional.test.py
@@ -104,7 +104,7 @@ tr = Test.AddTestRun("Small request 1")
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' http://slice/small')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/small', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr.Content = Testers.ContainsExpression('smol', 'expected smol')
ps.Streams.stdout.Content = Testers.ContainsExpression('X-Cache: miss', 'expected cache miss')
@@ -113,7 +113,7 @@ tr.StillRunningAfter = ts
# Test case: second request of small object - expect cache hit
tr = Test.AddTestRun("Small request 2")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/small')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/small', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr.Content = Testers.ContainsExpression('smol', 'expected smol')
ps.Streams.stdout.Content = Testers.ContainsExpression('X-Cache: hit-fresh', 'expected cache hit-fresh')
@@ -122,7 +122,7 @@ tr.StillRunningAfter = ts
# Test case: range request of small object - expect cache hit (proxy.config.http.cache.range.lookup = 1)
tr = Test.AddTestRun("Small request - ranged")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' -r 1-2 http://slice/small')
+tr.MakeCurlCommand(curl_and_args + ' -r 1-2 http://slice/small', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr.Content = Testers.ContainsExpression('mo', 'expected mo')
ps.Streams.stdout.Content = Testers.ContainsExpression('X-Cache: hit-fresh', 'expected cache hit-fresh')
@@ -131,7 +131,7 @@ tr.StillRunningAfter = ts
# Test case: first request of large object - expect unsliced, cache write disabled
tr = Test.AddTestRun("Large request 1")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/large')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/large', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr.Content = Testers.ContainsExpression('unsliced large object!', 'expected large object')
ps.Streams.stdout.Content = Testers.ContainsExpression('X-Cache: miss', 'expected cache miss')
@@ -140,7 +140,7 @@ tr.StillRunningAfter = ts
# Test case: first request of large object - expect sliced, cache miss
tr = Test.AddTestRun("Large request 2")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/large')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/large', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr.Content = Testers.ContainsExpression('large object sliced!', 'expected large object')
ps.Streams.stdout.Content = Testers.ContainsExpression('X-Cache: miss', 'expected cache miss')
@@ -149,7 +149,7 @@ tr.StillRunningAfter = ts
## Test case: first request of large object - expect cache hit
tr = Test.AddTestRun("Large request 3")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/large')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/large', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr.Content = Testers.ContainsExpression('large object sliced!', 'expected large object')
ps.Streams.stdout.Content = Testers.ContainsExpression('X-Cache: hit-fresh', 'expected cache hit-fresh')
diff --git a/tests/gold_tests/pluginTest/slice/slice_error.test.py b/tests/gold_tests/pluginTest/slice/slice_error.test.py
index 8db1d0e2b8..a99bff794c 100644
--- a/tests/gold_tests/pluginTest/slice/slice_error.test.py
+++ b/tests/gold_tests/pluginTest/slice/slice_error.test.py
@@ -257,7 +257,7 @@ tr = Test.AddTestRun("Etag test")
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' http://ats/etag')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/etag', ts=ts)
# ps.ReturnCode = 0 # curl will return fail status
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK response")
ps.Streams.stderr = "gold_error/contents.stderr.gold"
@@ -273,7 +273,7 @@ tr.StillRunningAfter = ts
# 2 Test - Last Modified mismatch test
tr = Test.AddTestRun("Last-Modified test")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://ats/lastmodified')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/lastmodified', ts=ts)
# ps.ReturnCode = 0 # curl will return fail status
ps.Streams.stderr = "gold_error/contents.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK response")
@@ -289,7 +289,7 @@ tr.StillRunningAfter = ts
# 4 Test - Block content-range
tr = Test.AddTestRun("Content-Range test")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://ats/crr')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/crr', ts=ts)
# ps.ReturnCode = 0 # curl will return fail status
ps.Streams.stderr = "gold_error/contents.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK response")
@@ -305,7 +305,7 @@ tr.StillRunningAfter = ts
# 6 Test - 404 internal test
tr = Test.AddTestRun("Internal 404 test")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://ats/internal404')
+tr.MakeCurlCommand(curl_and_args + ' http://ats/internal404', ts=ts)
# ps.ReturnCode = 0 # curl will return fail status
ps.Streams.stderr = "gold_error/contents.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK response")
diff --git a/tests/gold_tests/pluginTest/slice/slice_prefetch.test.py b/tests/gold_tests/pluginTest/slice/slice_prefetch.test.py
index 7d97d78b0b..5b544e9d09 100644
--- a/tests/gold_tests/pluginTest/slice/slice_prefetch.test.py
+++ b/tests/gold_tests/pluginTest/slice/slice_prefetch.test.py
@@ -114,7 +114,7 @@ tr = Test.AddTestRun("Full object slice: first block is miss, only block 14-20 p
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommandMulti(curl_and_args + ' http://sliceprefetchbytes1/path')
+tr.MakeCurlCommandMulti(curl_and_args + ' http://sliceprefetchbytes1/path', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_200.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK response")
@@ -124,7 +124,7 @@ tr.StillRunningAfter = ts
# 1 Test - Full object slice (hit-fresh) with no prefetched blocks, block bytes= 7
tr = Test.AddTestRun("Full object slice: first block is hit-fresh, no blocks prefetched")
ps = tr.Processes.Default
-tr.MakeCurlCommandMulti('sleep 1; ' + curl_and_args + ' http://sliceprefetchbytes1/path')
+tr.MakeCurlCommandMulti('sleep 1; ' + curl_and_args + ' http://sliceprefetchbytes1/path', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_200.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK response")
@@ -134,7 +134,7 @@ tr.StillRunningAfter = ts
# 2 Test - Full object slice with only next block prefetched in background, block bytes= 7
tr = Test.AddTestRun("Full object slice: first block is hit-stale, only block 14-20 prefetched")
ps = tr.Processes.Default
-tr.MakeCurlCommandMulti('sleep 5; ' + curl_and_args + ' http://sliceprefetchbytes1/path')
+tr.MakeCurlCommandMulti('sleep 5; ' + curl_and_args + ' http://sliceprefetchbytes1/path', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_200.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200 OK response")
@@ -144,7 +144,7 @@ tr.StillRunningAfter = ts
# 3 Test - Full object slice (hit-fresh) with no prefetched blocks, block bytes= 7
tr = Test.AddTestRun("Full object slice: first block is hit-fresh with range 0-, no blocks prefetched")
ps = tr.Processes.Default
-tr.MakeCurlCommandMulti(curl_and_args + ' http://sliceprefetchbytes1/path' + ' -r 0-')
+tr.MakeCurlCommandMulti(curl_and_args + ' http://sliceprefetchbytes1/path' + ' -r 0-', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_200.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 response")
@@ -155,7 +155,7 @@ tr.StillRunningAfter = ts
# 4 Test - Client range request (hit-stale/miss) enables prefetching
tr = Test.AddTestRun("Client range request")
ps = tr.Processes.Default
-tr.MakeCurlCommandMulti(curl_and_args + ' http://sliceprefetchbytes2/path' + ' -r 5-16')
+tr.MakeCurlCommandMulti(curl_and_args + ' http://sliceprefetchbytes2/path' + ' -r 5-16', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/slice_mid.stderr.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("206 Partial Content", "expected 206 response")
@@ -168,7 +168,7 @@ tr = Test.AddTestRun("Invalid end range request, 416")
beg = len(body) + 1
end = beg + block_bytes
ps = tr.Processes.Default
-tr.MakeCurlCommandMulti(curl_and_args + f' http://sliceprefetchbytes1/path -r {beg}-{end}')
+tr.MakeCurlCommandMulti(curl_and_args + f' http://sliceprefetchbytes1/path -r {beg}-{end}', ts=ts)
ps.Streams.stdout.Content = Testers.ContainsExpression("416 Requested Range Not Satisfiable", "expected 416 response")
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/slice/slice_regex.test.py b/tests/gold_tests/pluginTest/slice/slice_regex.test.py
index a7a975df97..abc0d40dde 100644
--- a/tests/gold_tests/pluginTest/slice/slice_regex.test.py
+++ b/tests/gold_tests/pluginTest/slice/slice_regex.test.py
@@ -115,7 +115,7 @@ tr = Test.AddTestRun("Exclude - asset passed through")
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' http://exclude/slice.txt')
+tr.MakeCurlCommand(curl_and_args + ' http://exclude/slice.txt', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Info: notsliced", "expected not sliced header")
tr.StillRunningAfter = ts
@@ -123,7 +123,7 @@ tr.StillRunningAfter = ts
# 1 Test - Exclude mp4 gets sliced
tr = Test.AddTestRun("Exclude - asset is sliced")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://exclude/slice.mp4')
+tr.MakeCurlCommand(curl_and_args + ' http://exclude/slice.mp4', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Info: sliced", "expected sliced header")
tr.StillRunningAfter = ts
@@ -132,7 +132,7 @@ tr.StillRunningAfter = ts
# 2 Test - Exclude: ensure txt passes through
tr = Test.AddTestRun("Include - asset passed through")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://include/slice.txt')
+tr.MakeCurlCommand(curl_and_args + ' http://include/slice.txt', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Info: notsliced", "expected not sliced header")
tr.StillRunningAfter = ts
@@ -140,7 +140,7 @@ tr.StillRunningAfter = ts
# 3 Test - Exclude mp4 gets sliced
tr = Test.AddTestRun("Include - asset is sliced")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://include/slice.mp4')
+tr.MakeCurlCommand(curl_and_args + ' http://include/slice.mp4', ts=ts)
ps.ReturnCode = 0
ps.Streams.stdout.Content = Testers.ContainsExpression("X-Info: sliced", "expected sliced header")
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/pluginTest/slice/slice_selfhealing.test.py b/tests/gold_tests/pluginTest/slice/slice_selfhealing.test.py
index 9959a9d348..3c1ec42c5d 100644
--- a/tests/gold_tests/pluginTest/slice/slice_selfhealing.test.py
+++ b/tests/gold_tests/pluginTest/slice/slice_selfhealing.test.py
@@ -143,7 +143,7 @@ tr = Test.AddTestRun("Preload reference etagnew-0")
ps = tr.Processes.Default
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
ps.StartBefore(Test.Processes.ts)
-tr.MakeCurlCommand(curl_and_args + ' http://crr/second -r 0-2 -H "uuid: etagnew-0"')
+tr.MakeCurlCommand(curl_and_args + ' http://crr/second -r 0-2 -H "uuid: etagnew-0"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/bbb.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("etagnew", "expected etagnew")
@@ -152,7 +152,7 @@ tr.StillRunningAfter = ts
# 1 Test - Preload slice etagold-1
tr = Test.AddTestRun("Preload slice etagold-1")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://crr/second -r 3-5 -H "uuid: etagold-1"')
+tr.MakeCurlCommand(curl_and_args + ' http://crr/second -r 3-5 -H "uuid: etagold-1"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/aa.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("etagold", "expected etagold")
@@ -161,7 +161,7 @@ tr.StillRunningAfter = ts
# 2 Test - Request second slice via slice plugin, with instructions to fetch new 2nd slice
tr = Test.AddTestRun("Request 2nd slice (expect refetch)")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/second -r 3- -H "uuid: etagnew-1"')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/second -r 3- -H "uuid: etagnew-1"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/bb.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("etagnew", "expected etagnew")
@@ -170,7 +170,7 @@ tr.StillRunningAfter = ts
# 3 Test - Request fully healed asset via slice plugin
tr = Test.AddTestRun("Request full healed slice")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/second')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/second', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr.Content = Testers.ContainsExpression("bbbbb", "expected bbbbb content")
ps.Streams.stdout.Content = Testers.ContainsExpression("etagnew", "expected etagnew")
@@ -232,7 +232,7 @@ server.addResponse("sessionlog.json", req_header_refnew1, res_header_refnew1)
# 4 Test - Preload reference etagold-0
tr = Test.AddTestRun("Preload reference etagold-0")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://crr/reference -r 0-2 -H "uuid: etagold-0"')
+tr.MakeCurlCommand(curl_and_args + ' http://crr/reference -r 0-2 -H "uuid: etagold-0"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/aaa.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("etagold", "expected etagold")
@@ -241,7 +241,7 @@ tr.StillRunningAfter = ts
# 5 Test - Preload reference etagnew-1
tr = Test.AddTestRun("Preload slice etagnew-1")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://crr/reference -r 3-5 -H "uuid: etagnew-1"')
+tr.MakeCurlCommand(curl_and_args + ' http://crr/reference -r 3-5 -H "uuid: etagnew-1"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/bb.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("etagnew", "expected etagnew")
@@ -252,7 +252,7 @@ tr.StillRunningAfter = ts
# refetch it
tr = Test.AddTestRun("Request 2nd slice (expect abort)")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/reference -r 3- -H "uuid: etagnew-0" -w "SENT: \'%{size_download}\'"')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/reference -r 3- -H "uuid: etagnew-0" -w "SENT: \'%{size_download}\'"', ts=ts)
# ps.ReturnCode = 0 # curl will fail here
ps.Streams.stdout.Content = Testers.ContainsExpression("etagold", "expected etagold")
ps.Streams.stdout.Content += Testers.ContainsExpression("SENT: '0'", "expected empty payload")
@@ -261,7 +261,7 @@ tr.StillRunningAfter = ts
# 7 Test - Request full healed asset via slice plugin
tr = Test.AddTestRun("Request full healed slice")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/reference')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/reference', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr.Content = Testers.ContainsExpression("bbbbb", "expected bbbbb content")
ps.Streams.stdout.Content = Testers.ContainsExpression("etagnew", "expected etagnew")
@@ -287,7 +287,7 @@ server.addResponse("sessionlog.json", req_header_200, res_header_200)
# 8 test - Request through slice but get a 200 back
tr = Test.AddTestRun("Request gets a 200")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/code200 -r 3-5 -H "uuid: code200"')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/code200 -r 3-5 -H "uuid: code200"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr.Content = Testers.ContainsExpression("ccccc", "expected full ccccc content")
ps.Streams.stdout.Content = Testers.ContainsExpression("200 OK", "expected 200")
@@ -316,7 +316,7 @@ server.addResponse("sessionlog.json", req_header_assetgone0, res_header_assetgon
# 9 test - Preload reference slice
tr = Test.AddTestRun("Preload reference assetgone-0")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/assetgone -r 0-2 -H "uuid: assetgone-0"')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/assetgone -r 0-2 -H "uuid: assetgone-0"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/aaa.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("etag", "expected etag")
@@ -325,7 +325,7 @@ tr.StillRunningAfter = ts
# 10 test - Fetch full asset, 2nd slice should trigger 404 response
tr = Test.AddTestRun("Fetch full asset")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/assetgone')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/assetgone', ts=ts)
# ps.ReturnCode = 0 # curl will return non zero
ps.Streams.stderr = "gold/aaa.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("etag", "expected etag")
@@ -335,7 +335,7 @@ tr.StillRunningAfter = ts
# 11 test - Fetch full asset again, full blown 404
tr = Test.AddTestRun("Fetch full asset, 404")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slice/assetgone')
+tr.MakeCurlCommand(curl_and_args + ' http://slice/assetgone', ts=ts)
# ps.ReturnCode = 0 # curl will return non zero
ps.Streams.stdout.Content = Testers.ContainsExpression("404 Not Found", "Expected 404")
tr.StillRunningAfter = ts
@@ -348,7 +348,7 @@ edate = to_httpdate(edt)
# 12 Test - Preload reference etagold-1
tr = Test.AddTestRun("Preload slice etagold-1")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + f' http://crrhdr/second -r 3-5 -H "uuid: etagold-1" -H "crr-foo: {edate}"')
+tr.MakeCurlCommand(curl_and_args + f' http://crrhdr/second -r 3-5 -H "uuid: etagold-1" -H "crr-foo: {edate}"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/aa.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("etagold", "expected etagold")
@@ -357,7 +357,7 @@ tr.StillRunningAfter = ts
# 13 Test - Request second slice via slice plugin, with instructions to fetch new 2nd slice
tr = Test.AddTestRun("Request 2nd slice (expect refetch)")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + ' http://slicehdr/second -r 3- -H "uuid: etagnew-1"')
+tr.MakeCurlCommand(curl_and_args + ' http://slicehdr/second -r 3- -H "uuid: etagnew-1"', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/bb.gold"
ps.Streams.stdout.Content = Testers.ContainsExpression("etagnew", "expected etagnew")
diff --git a/tests/gold_tests/pluginTest/sslheaders/sslheaders.test.py b/tests/gold_tests/pluginTest/sslheaders/sslheaders.test.py
index 9147172a92..85c12b8c5d 100644
--- a/tests/gold_tests/pluginTest/sslheaders/sslheaders.test.py
+++ b/tests/gold_tests/pluginTest/sslheaders/sslheaders.test.py
@@ -21,6 +21,7 @@ Test.Summary = '''
Test sslheaders plugin.
'''
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
Test.SkipUnless(
Condition.PluginExists('sslheaders.so'),
Condition.HasCurlFeature('http2'),
@@ -66,5 +67,6 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.MakeCurlCommand(
'-H "SSL-Client-ID: My Fake Client ID" --verbose --ipv4 --insecure --header "Host: bar.com"' +
- ' https://localhost:{}'.format(ts.Variables.ssl_port))
+ ' https://localhost:{}'.format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/pluginTest/stats_over_http/stats_over_http.test.py b/tests/gold_tests/pluginTest/stats_over_http/stats_over_http.test.py
index 5ccfbe0d46..e70cdbf64e 100644
--- a/tests/gold_tests/pluginTest/stats_over_http/stats_over_http.test.py
+++ b/tests/gold_tests/pluginTest/stats_over_http/stats_over_http.test.py
@@ -66,7 +66,7 @@ class StatsOverHttpPluginTest:
def __testCaseNoAccept(self):
tr = Test.AddTestRun('Fetch stats over HTTP in JSON format: no Accept and default path')
self.__checkProcessBefore(tr)
- tr.MakeCurlCommand(f"-vs --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats")
+ tr.MakeCurlCommand(f"-vs --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats", ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout += Testers.ContainsExpression('{ "global": {', 'Output should have the JSON header.')
tr.Processes.Default.Streams.stdout += Testers.ContainsExpression(
@@ -78,7 +78,7 @@ class StatsOverHttpPluginTest:
def __testCaseAcceptCSV(self):
tr = Test.AddTestRun('Fetch stats over HTTP in CSV format')
self.__checkProcessBefore(tr)
- tr.MakeCurlCommand(f"-vs -H'Accept: text/csv' --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats")
+ tr.MakeCurlCommand(f"-vs -H'Accept: text/csv' --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats", ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout += Testers.ContainsExpression(
'proxy.process.http.delete_requests,0', 'Output should be CSV formatted.')
@@ -89,7 +89,8 @@ class StatsOverHttpPluginTest:
def __testCaseAcceptPrometheus(self):
tr = Test.AddTestRun('Fetch stats over HTTP in Prometheus format')
self.__checkProcessBefore(tr)
- tr.MakeCurlCommand(f"-vs -H'Accept: text/plain; version=0.0.4' --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats")
+ tr.MakeCurlCommand(
+ f"-vs -H'Accept: text/plain; version=0.0.4' --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats", ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout += Testers.ContainsExpression(
'proxy_process_http_delete_requests 0', 'Output should be Prometheus formatted.')
@@ -100,7 +101,7 @@ class StatsOverHttpPluginTest:
def __testCasePathJSON(self):
tr = Test.AddTestRun('Fetch stats over HTTP in JSON format via /_stats/json')
self.__checkProcessBefore(tr)
- tr.MakeCurlCommand(f"-vs --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats/json")
+ tr.MakeCurlCommand(f"-vs --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats/json", ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout += Testers.ContainsExpression('{ "global": {', 'JSON header expected.')
tr.Processes.Default.Streams.stdout += Testers.ContainsExpression(
@@ -112,7 +113,7 @@ class StatsOverHttpPluginTest:
def __testCasePathCSV(self):
tr = Test.AddTestRun('Fetch stats over HTTP in CSV format via /_stats/csv')
self.__checkProcessBefore(tr)
- tr.MakeCurlCommand(f"-vs --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats/csv")
+ tr.MakeCurlCommand(f"-vs --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats/csv", ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout += Testers.ContainsExpression(
'proxy.process.http.delete_requests,0', 'CSV output expected.')
@@ -123,7 +124,7 @@ class StatsOverHttpPluginTest:
def __testCasePathPrometheus(self):
tr = Test.AddTestRun('Fetch stats over HTTP in Prometheus format via /_stats/prometheus')
self.__checkProcessBefore(tr)
- tr.MakeCurlCommand(f"-vs --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats/prometheus")
+ tr.MakeCurlCommand(f"-vs --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats/prometheus", ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout += Testers.ContainsExpression(
'proxy_process_http_delete_requests 0', 'Prometheus output expected.')
@@ -134,7 +135,8 @@ class StatsOverHttpPluginTest:
def __testCaseAcceptIgnoredIfPathExplicit(self):
tr = Test.AddTestRun('Fetch stats over HTTP in Prometheus format with Accept csv header')
self.__checkProcessBefore(tr)
- tr.MakeCurlCommand(f"-vs -H'Accept: text/csv' --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats/prometheus")
+ tr.MakeCurlCommand(
+ f"-vs -H'Accept: text/csv' --http1.1 http://127.0.0.1:{self.ts.Variables.port}/_stats/prometheus", ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout += Testers.ContainsExpression(
'proxy_process_http_delete_requests 0', 'Prometheus output expected.')
diff --git a/tests/gold_tests/pluginTest/test_hooks/body_buffer.test.py b/tests/gold_tests/pluginTest/test_hooks/body_buffer.test.py
index dedce2bc0c..07e1934341 100644
--- a/tests/gold_tests/pluginTest/test_hooks/body_buffer.test.py
+++ b/tests/gold_tests/pluginTest/test_hooks/body_buffer.test.py
@@ -17,8 +17,6 @@ Verify HTTP body buffering.
# See the License for the specific language governing permissions and
# limitations under the License.
-import os
-
Test.SkipUnless(Condition.PluginExists('request_buffer.so'))
@@ -109,6 +107,7 @@ class BodyBufferTest:
{
'proxy.config.diags.debug.enabled': 1,
'proxy.config.diags.debug.tags': 'request_buffer',
+ 'proxy.config.http.server_ports': str(self._ts.Variables.port) + f" {self._ts.Variables.uds_path}",
})
self._ts.Disk.traffic_out.Content = Testers.ContainsExpression(
@@ -123,8 +122,8 @@ class BodyBufferTest:
# Send both a Content-Length request and a chunked-encoded request.
tr.MakeCurlCommand(
f'-v http://127.0.0.1:{self._ts.Variables.port}/contentlength -d "{self.content_length_request_body}" --next '
- f'-v http://127.0.0.1:{self._ts.Variables.port}/chunked -H "Transfer-Encoding: chunked" -d "{self.chunked_request_body}"'
- )
+ f'-v http://127.0.0.1:{self._ts.Variables.port}/chunked -H "Transfer-Encoding: chunked" -d "{self.chunked_request_body}"',
+ ts=self._ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(self._server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
diff --git a/tests/gold_tests/pluginTest/test_hooks/hook_add.test.py b/tests/gold_tests/pluginTest/test_hooks/hook_add.test.py
index 19df23ac55..595e37e311 100644
--- a/tests/gold_tests/pluginTest/test_hooks/hook_add.test.py
+++ b/tests/gold_tests/pluginTest/test_hooks/hook_add.test.py
@@ -42,12 +42,16 @@ Test.PrepareTestPlugin(os.path.join(Test.Variables.AtsTestPluginsDir, 'hook_add_
ts.Disk.remap_config.AddLine("map http://one http://127.0.0.1:{0}".format(server.Variables.Port))
+ipv4flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
+
tr = Test.AddTestRun()
# Probe server port to check if ready.
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
#
-tr.MakeCurlCommand('--verbose --ipv4 --header "Host: one" http://localhost:{0}/argh'.format(ts.Variables.port))
+tr.MakeCurlCommand('--verbose {0} --header "Host: one" http://localhost:{1}/argh'.format(ipv4flag, ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
# Look at the debug output from the plugin
diff --git a/tests/gold_tests/pluginTest/test_hooks/log_uds.gold b/tests/gold_tests/pluginTest/test_hooks/log_uds.gold
new file mode 100644
index 0000000000..defcc76f48
--- /dev/null
+++ b/tests/gold_tests/pluginTest/test_hooks/log_uds.gold
@@ -0,0 +1,12 @@
+Global: event=TS_EVENT_HTTP_SSN_START
+Global: event=TS_EVENT_HTTP_TXN_START
+Session: event=TS_EVENT_HTTP_TXN_START
+Global: event=TS_EVENT_HTTP_READ_REQUEST_HDR
+Session: event=TS_EVENT_HTTP_READ_REQUEST_HDR
+Transaction: event=TS_EVENT_HTTP_READ_REQUEST_HDR
+Global: event=TS_EVENT_HTTP_TXN_CLOSE
+Session: event=TS_EVENT_HTTP_TXN_CLOSE
+Transaction: event=TS_EVENT_HTTP_TXN_CLOSE
+Global: event=TS_EVENT_HTTP_SSN_CLOSE
+Session: event=TS_EVENT_HTTP_SSN_CLOSE
+``
diff --git a/tests/gold_tests/pluginTest/test_hooks/ssn_start_delay_hook.test.py b/tests/gold_tests/pluginTest/test_hooks/ssn_start_delay_hook.test.py
index d31b656dee..7a10b9a299 100644
--- a/tests/gold_tests/pluginTest/test_hooks/ssn_start_delay_hook.test.py
+++ b/tests/gold_tests/pluginTest/test_hooks/ssn_start_delay_hook.test.py
@@ -43,13 +43,17 @@ Test.PrepareTestPlugin(os.path.join(Test.Variables.AtsTestPluginsDir, 'hook_add_
ts.Disk.remap_config.AddLine("map http://one http://127.0.0.1:{0}".format(server.Variables.Port))
+ipv4flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
+
tr = Test.AddTestRun()
# Probe server port to check if ready.
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
# Probe TS cleartext port to check if ready (probing TLS port causes spurious VCONN hook triggers).
tr.Processes.Default.StartBefore(Test.Processes.ts, ready=When.PortOpen(ts.Variables.port))
#
-tr.MakeCurlCommand('--verbose --ipv4 --header "Host: one" http://localhost:{0}/argh'.format(ts.Variables.port))
+tr.MakeCurlCommand('--verbose {0} --header "Host: one" http://localhost:{1}/argh'.format(ipv4flag, ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
# Look at the debug output from the plugin
diff --git a/tests/gold_tests/pluginTest/test_hooks/test_hooks.test.py b/tests/gold_tests/pluginTest/test_hooks/test_hooks.test.py
index 950b3fd5c0..20ca7fbb1d 100644
--- a/tests/gold_tests/pluginTest/test_hooks/test_hooks.test.py
+++ b/tests/gold_tests/pluginTest/test_hooks/test_hooks.test.py
@@ -56,23 +56,29 @@ Test.PrepareTestPlugin(os.path.join(Test.Variables.AtsTestPluginsDir, 'test_hook
ts.Disk.remap_config.AddLine("map http://one http://127.0.0.1:{0}".format(server.Variables.Port))
ts.Disk.remap_config.AddLine("map https://one http://127.0.0.1:{0}".format(server.Variables.Port))
+ipv4flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
+
tr = Test.AddTestRun()
# Probe server port to check if ready.
tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
tr.Processes.Default.StartBefore(Test.Processes.ts)
#
-tr.MakeCurlCommand('--verbose --ipv4 --header "Host: one" http://localhost:{0}/argh'.format(ts.Variables.port))
+tr.MakeCurlCommand('--verbose {0} --header "Host: one" http://localhost:{1}/argh'.format(ipv4flag, ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
-tr = Test.AddTestRun()
-tr.MakeCurlCommand(
- '--verbose --ipv4 --http2 --insecure --header "Host: one" https://localhost:{0}/argh'.format(ts.Variables.ssl_port))
-tr.Processes.Default.ReturnCode = 0
+if not Condition.CurlUsingUnixDomainSocket():
+ tr = Test.AddTestRun()
+ tr.MakeCurlCommand(
+ '--verbose --ipv4 --http2 --insecure --header "Host: one" https://localhost:{0}/argh'.format(ts.Variables.ssl_port), ts=ts)
+ tr.Processes.Default.ReturnCode = 0
-tr = Test.AddTestRun()
-tr.MakeCurlCommand(
- '--verbose --ipv4 --http1.1 --insecure --header "Host: one" https://localhost:{0}/argh'.format(ts.Variables.ssl_port))
-tr.Processes.Default.ReturnCode = 0
+ tr = Test.AddTestRun()
+ tr.MakeCurlCommand(
+ '--verbose --ipv4 --http1.1 --insecure --header "Host: one" https://localhost:{0}/argh'.format(ts.Variables.ssl_port),
+ ts=ts)
+ tr.Processes.Default.ReturnCode = 0
# The probing of the ATS port to detect when ATS is ready may be seen by ATS as a VCONN start/close, so filter out these
# events from the log file.
@@ -85,5 +91,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.Command = "echo check log"
tr.Processes.Default.ReturnCode = 0
f = tr.Disk.File(log_path)
-f.Content = "log.gold"
-f.Content += Testers.ContainsExpression("Global: event=TS_EVENT_VCONN_CLOSE", "VCONN_CLOSE should trigger 2 times")
+if Condition.CurlUsingUnixDomainSocket():
+ f.Content = "log_uds.gold"
+else:
+ f.Content = "log.gold"
+ f.Content += Testers.ContainsExpression("Global: event=TS_EVENT_VCONN_CLOSE", "VCONN_CLOSE should trigger 2 times")
diff --git a/tests/gold_tests/pluginTest/tsapi/log_uds.gold b/tests/gold_tests/pluginTest/tsapi/log_uds.gold
new file mode 100644
index 0000000000..7444e77b0d
--- /dev/null
+++ b/tests/gold_tests/pluginTest/tsapi/log_uds.gold
@@ -0,0 +1,106 @@
+TSRemapNewInstance():
+argv[0]=http://myhost.test/
+argv[1]=http://127.0.0.1:SERVER_PORT/
+TSRemapNewInstance():
+argv[0]=http://myhost.test/
+argv[1]=http://127.0.0.1:SERVER_PORT/
+TSRemapNewInstance():
+argv[0]=https://myhost.test:123/
+argv[1]=http://127.0.0.1:SERVER_PORT/
+TSRemapNewInstance():
+argv[0]=https://myhost.test:123/
+argv[1]=http://127.0.0.1:SERVER_PORT/
+Global: event=TS_EVENT_HTTP_TXN_START
+Global: event=TS_EVENT_HTTP_READ_REQUEST_HDR
+TSHttpTxnEffectiveUrlStringGet(): http://mYhOsT.teSt/
+Client Request:
+TSHttpHdrEffectiveUrlBufGet(): http://myhost.test/
+TSUrlSchemeGet(): http
+TSUrlRawSchemeGet(): http
+TSUrlPortGet(): 80
+TSUrlRawPortGet(): 0
+Transaction: event=TS_EVENT_HTTP_READ_REQUEST_HDR
+TSHttpTxnEffectiveUrlStringGet(): http://mYhOsT.teSt/
+Client Request:
+TSHttpHdrEffectiveUrlBufGet(): http://myhost.test/
+TSUrlSchemeGet(): http
+TSUrlRawSchemeGet(): http
+TSUrlPortGet(): 80
+TSUrlRawPortGet(): 0
+TSRemapDoRemap(): instance=0 redirect=0
+Remap Request:
+TSHttpHdrEffectiveUrlBufGet(): http://127.0.0.1:SERVER_PORT/
+TSUrlSchemeGet(): http
+TSUrlRawSchemeGet(): http
+TSUrlPortGet(): SERVER_PORT
+TSUrlRawPortGet(): SERVER_PORT
+TSRemapDoRemap(): instance=1 redirect=0
+Remap Request:
+TSHttpHdrEffectiveUrlBufGet(): http://127.0.0.1:SERVER_PORT/
+TSUrlSchemeGet(): http
+TSUrlRawSchemeGet(): http
+TSUrlPortGet(): SERVER_PORT
+TSUrlRawPortGet(): SERVER_PORT
+Global: event=TS_EVENT_HTTP_SEND_REQUEST_HDR
+TSHttpTxnEffectiveUrlStringGet(): http://127.0.0.1:SERVER_PORT/
+Request To Server:
+TSHttpHdrEffectiveUrlBufGet(): http://127.0.0.1:SERVER_PORT/
+TSUrlSchemeGet(): http
+TSUrlRawSchemeGet(): failed to get raw URL scheme
+TSUrlPortGet(): 80
+TSUrlRawPortGet(): 0
+Transaction: event=TS_EVENT_HTTP_SEND_REQUEST_HDR
+TSHttpTxnEffectiveUrlStringGet(): http://127.0.0.1:SERVER_PORT/
+Request To Server:
+TSHttpHdrEffectiveUrlBufGet(): http://127.0.0.1:SERVER_PORT/
+TSUrlSchemeGet(): http
+TSUrlRawSchemeGet(): failed to get raw URL scheme
+TSUrlPortGet(): 80
+TSUrlRawPortGet(): 0
+Global: event=TS_EVENT_HTTP_TXN_START
+Global: event=TS_EVENT_HTTP_READ_REQUEST_HDR
+TSHttpTxnEffectiveUrlStringGet(): http://mYhOsT.teSt/xYz
+Client Request:
+TSHttpHdrEffectiveUrlBufGet(): http://myhost.test/xYz
+TSUrlSchemeGet(): http
+TSUrlRawSchemeGet(): http
+TSUrlPortGet(): 80
+TSUrlRawPortGet(): 0
+Transaction: event=TS_EVENT_HTTP_READ_REQUEST_HDR
+TSHttpTxnEffectiveUrlStringGet(): http://mYhOsT.teSt/xYz
+Client Request:
+TSHttpHdrEffectiveUrlBufGet(): http://myhost.test/xYz
+TSUrlSchemeGet(): http
+TSUrlRawSchemeGet(): http
+TSUrlPortGet(): 80
+TSUrlRawPortGet(): 0
+TSRemapDoRemap(): instance=0 redirect=0
+Remap Request:
+TSHttpHdrEffectiveUrlBufGet(): http://127.0.0.1:SERVER_PORT/xYz
+TSUrlSchemeGet(): http
+TSUrlRawSchemeGet(): http
+TSUrlPortGet(): SERVER_PORT
+TSUrlRawPortGet(): SERVER_PORT
+TSRemapDoRemap(): instance=1 redirect=0
+Remap Request:
+TSHttpHdrEffectiveUrlBufGet(): http://127.0.0.1:SERVER_PORT/xYz
+TSUrlSchemeGet(): http
+TSUrlRawSchemeGet(): http
+TSUrlPortGet(): SERVER_PORT
+TSUrlRawPortGet(): SERVER_PORT
+Global: event=TS_EVENT_HTTP_SEND_REQUEST_HDR
+TSHttpTxnEffectiveUrlStringGet(): http://127.0.0.1:SERVER_PORT/xYz
+Request To Server:
+TSHttpHdrEffectiveUrlBufGet(): http://127.0.0.1:SERVER_PORT/xYz
+TSUrlSchemeGet(): http
+TSUrlRawSchemeGet(): failed to get raw URL scheme
+TSUrlPortGet(): 80
+TSUrlRawPortGet(): 0
+Transaction: event=TS_EVENT_HTTP_SEND_REQUEST_HDR
+TSHttpTxnEffectiveUrlStringGet(): http://127.0.0.1:SERVER_PORT/xYz
+Request To Server:
+TSHttpHdrEffectiveUrlBufGet(): http://127.0.0.1:SERVER_PORT/xYz
+TSUrlSchemeGet(): http
+TSUrlRawSchemeGet(): failed to get raw URL scheme
+TSUrlPortGet(): 80
+TSUrlRawPortGet(): 0
diff --git a/tests/gold_tests/pluginTest/tsapi/tsapi.test.py b/tests/gold_tests/pluginTest/tsapi/tsapi.test.py
index 3d77367fdb..84b5ba4be6 100644
--- a/tests/gold_tests/pluginTest/tsapi/tsapi.test.py
+++ b/tests/gold_tests/pluginTest/tsapi/tsapi.test.py
@@ -65,6 +65,10 @@ ts.Disk.remap_config.AddLine(
ts.Disk.remap_config.AddLine(
"map https://myhost.test:123 http://127.0.0.1:{0} @plugin={1} @plugin={1}".format(server.Variables.Port, f"{plugin_name}.so"))
+ipv4flag = ""
+if not Condition.CurlUsingUnixDomainSocket():
+ ipv4flag = "--ipv4"
+
# For some reason, without this delay, traffic_server cannot reliably open the cleartext port for listening without an
# error.
#
@@ -76,17 +80,19 @@ tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
#
-tr.MakeCurlCommand('--verbose --ipv4 --header "Host: mYhOsT.teSt" hTtP://loCalhOst:{}/'.format(ts.Variables.port))
+tr.MakeCurlCommand('--verbose {0} --header "Host: mYhOsT.teSt" hTtP://loCalhOst:{1}/'.format(ipv4flag, ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--verbose --ipv4 --proxy localhost:{} http://mYhOsT.teSt/xYz'.format(ts.Variables.port))
-tr.Processes.Default.ReturnCode = 0
+tr.MakeCurlCommand('--verbose {0} --proxy localhost:{1} http://mYhOsT.teSt/xYz'.format(ipv4flag, ts.Variables.port), ts=ts)
-tr = Test.AddTestRun()
-tr.MakeCurlCommand(
- '--verbose --ipv4 --http2 --insecure --header ' + '"Host: myhost.test:123" HttPs://LocalHost:{}/'.format(ts.Variables.ssl_port))
-tr.Processes.Default.ReturnCode = 0
+if not Condition.CurlUsingUnixDomainSocket():
+ tr = Test.AddTestRun()
+ tr.MakeCurlCommand(
+ '--verbose --ipv4 --http2 --insecure --header ' +
+ '"Host: myhost.test:123" HttPs://LocalHost:{}/'.format(ts.Variables.ssl_port),
+ ts=ts)
+ tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun()
# Change server port number (which can vary) to a fixed string for compare to gold file.
@@ -94,4 +100,7 @@ second_log_file_name = os.path.join(ts.Variables.LOGDIR, "log2.txt")
tr.Processes.Default.Command = f"sed 's/{server.Variables.Port}/SERVER_PORT/' < {log_file_name} > {second_log_file_name}"
tr.Processes.Default.ReturnCode = 0
f = tr.Disk.File(second_log_file_name)
-f.Content = "log.gold"
+if Condition.CurlUsingUnixDomainSocket():
+ f.Content = "log_uds.gold"
+else:
+ f.Content = "log.gold"
diff --git a/tests/gold_tests/pluginTest/uri_signing/uri_signing.test.py b/tests/gold_tests/pluginTest/uri_signing/uri_signing.test.py
index 5425673008..2cf47f7621 100644
--- a/tests/gold_tests/pluginTest/uri_signing/uri_signing.test.py
+++ b/tests/gold_tests/pluginTest/uri_signing/uri_signing.test.py
@@ -102,7 +102,7 @@ tr = Test.AddTestRun("unsigned request")
ps = tr.Processes.Default
ps.StartBefore(ts)
ps.StartBefore(server, ready=When.PortOpen(server.Variables.Port))
-tr.MakeCurlCommand(curl_and_args + 'http://somehost/someasset.ts')
+tr.MakeCurlCommand(curl_and_args + 'http://somehost/someasset.ts', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/403.gold"
tr.StillRunningAfter = server
@@ -111,7 +111,7 @@ tr.StillRunningAfter = ts
# 1 - accept a passthru request
tr = Test.AddTestRun("passthru request")
ps = tr.Processes.Default
-tr.MakeCurlCommand(curl_and_args + 'http://somehost/crossdomain.xml')
+tr.MakeCurlCommand(curl_and_args + 'http://somehost/crossdomain.xml', ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/200.gold"
tr.StillRunningAfter = server
@@ -122,8 +122,8 @@ tr = Test.AddTestRun("good signed")
ps = tr.Processes.Default
tr.MakeCurlCommand(
curl_and_args +
- '"http://somehost/someasset.ts?URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjE5MjMwNTYwODR9.zw_wFQ-wvrWmfPLGj3hAUWn-GOHkiJZi2but4KV0paY"'
-)
+ '"http://somehost/someasset.ts?URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjE5MjMwNTYwODR9.zw_wFQ-wvrWmfPLGj3hAUWn-GOHkiJZi2but4KV0paY"',
+ ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/200.gold"
tr.StillRunningAfter = server
@@ -134,8 +134,8 @@ tr = Test.AddTestRun("expired signed")
ps = tr.Processes.Default
tr.MakeCurlCommand(
curl_and_args +
- '"http://somehost/someasset.ts?URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjF9.GkdlOPHQc6BqS4Q6x79GeYuVFO2zuGbaPZZsJfD6ir8"'
-)
+ '"http://somehost/someasset.ts?URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjF9.GkdlOPHQc6BqS4Q6x79GeYuVFO2zuGbaPZZsJfD6ir8"',
+ ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/403.gold"
tr.StillRunningAfter = server
@@ -146,8 +146,8 @@ tr = Test.AddTestRun("good token, second key")
ps = tr.Processes.Default
tr.MakeCurlCommand(
curl_and_args +
- '"http://somehost/someasset.ts?URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjE5MjMwNTYwODR9.ozH4sNwgcOlTZT0l4RQlVCH_osxz9yI1HCBesEv-jYg"'
-)
+ '"http://somehost/someasset.ts?URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjE5MjMwNTYwODR9.ozH4sNwgcOlTZT0l4RQlVCH_osxz9yI1HCBesEv-jYg"',
+ ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/200.gold"
tr.StillRunningAfter = server
@@ -158,8 +158,8 @@ tr = Test.AddTestRun("good signed")
ps = tr.Processes.Default
tr.MakeCurlCommand(
curl_and_args +
- '"http://somehost/URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjE5MjMwNTYwODR9.zw_wFQ-wvrWmfPLGj3hAUWn-GOHkiJZi2but4KV0paY/someasset.ts"'
-)
+ '"http://somehost/URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjE5MjMwNTYwODR9.zw_wFQ-wvrWmfPLGj3hAUWn-GOHkiJZi2but4KV0paY/someasset.ts"',
+ ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/200.gold"
tr.StillRunningAfter = server
@@ -170,8 +170,8 @@ tr = Test.AddTestRun("expired signed")
ps = tr.Processes.Default
tr.MakeCurlCommand(
curl_and_args +
- '"http://somehost/URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjF9.GkdlOPHQc6BqS4Q6x79GeYuVFO2zuGbaPZZsJfD6ir8/someasset.ts"'
-)
+ '"http://somehost/URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjF9.GkdlOPHQc6BqS4Q6x79GeYuVFO2zuGbaPZZsJfD6ir8/someasset.ts"',
+ ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/403.gold"
tr.StillRunningAfter = server
@@ -182,8 +182,8 @@ tr = Test.AddTestRun("good signed, param")
ps = tr.Processes.Default
tr.MakeCurlCommand(
curl_and_args +
- '"http://somehost/someasset.ts;URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjE5MjMwNTYwODR9.zw_wFQ-wvrWmfPLGj3hAUWn-GOHkiJZi2but4KV0paY"'
-)
+ '"http://somehost/someasset.ts;URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjE5MjMwNTYwODR9.zw_wFQ-wvrWmfPLGj3hAUWn-GOHkiJZi2but4KV0paY"',
+ ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/200.gold"
tr.StillRunningAfter = server
@@ -194,8 +194,8 @@ tr = Test.AddTestRun("expired signed, param")
ps = tr.Processes.Default
tr.MakeCurlCommand(
curl_and_args +
- '"http://somehost/someasset.ts;URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjF9.GkdlOPHQc6BqS4Q6x79GeYuVFO2zuGbaPZZsJfD6ir8"'
-)
+ '"http://somehost/someasset.ts;URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjF9.GkdlOPHQc6BqS4Q6x79GeYuVFO2zuGbaPZZsJfD6ir8"',
+ ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/403.gold"
tr.StillRunningAfter = server
@@ -206,8 +206,8 @@ tr = Test.AddTestRun("good signed cookie")
ps = tr.Processes.Default
tr.MakeCurlCommand(
curl_and_args +
- '"http://somehost/someasset.ts" -H "Cookie: URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjE5MjMwNTYwODR9.zw_wFQ-wvrWmfPLGj3hAUWn-GOHkiJZi2but4KV0paY"'
-)
+ '"http://somehost/someasset.ts" -H "Cookie: URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjE5MjMwNTYwODR9.zw_wFQ-wvrWmfPLGj3hAUWn-GOHkiJZi2but4KV0paY"',
+ ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/200.gold"
tr.StillRunningAfter = server
@@ -218,8 +218,8 @@ tr = Test.AddTestRun("expired signed cooked")
ps = tr.Processes.Default
tr.MakeCurlCommand(
curl_and_args +
- '"http://somehost/someasset.ts" -H "Cookie: URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjF9.GkdlOPHQc6BqS4Q6x79GeYuVFO2zuGbaPZZsJfD6ir8"'
-)
+ '"http://somehost/someasset.ts" -H "Cookie: URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjF9.GkdlOPHQc6BqS4Q6x79GeYuVFO2zuGbaPZZsJfD6ir8"',
+ ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/403.gold"
tr.StillRunningAfter = server
@@ -230,8 +230,8 @@ tr = Test.AddTestRun("multiple cookies, expired then good")
ps = tr.Processes.Default
tr.MakeCurlCommand(
curl_and_args +
- '"http://somehost/someasset.ts" -H "Cookie: URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjF9.GkdlOPHQc6BqS4Q6x79GeYuVFO2zuGbaPZZsJfD6ir8;URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjE5MjMwNTYwODR9.zw_wFQ-wvrWmfPLGj3hAUWn-GOHkiJZi2but4KV0paY"'
-)
+ '"http://somehost/someasset.ts" -H "Cookie: URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjF9.GkdlOPHQc6BqS4Q6x79GeYuVFO2zuGbaPZZsJfD6ir8;URISigningPackage=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJpc3N1ZXIiLCJleHAiOjE5MjMwNTYwODR9.zw_wFQ-wvrWmfPLGj3hAUWn-GOHkiJZi2but4KV0paY"',
+ ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/200.gold"
tr.StillRunningAfter = server
@@ -242,8 +242,8 @@ tr = Test.AddTestRun("Missing iss field in the payload")
ps = tr.Processes.Default
tr.MakeCurlCommand(
curl_and_args +
- '"http://somehost/someasset.ts?URISigningPackage=ewogICJ0eXAiOiAiSldUIiwKICAiYWxnIjogIkhTMjU2Igp9.ewogICJleHAiOiAxOTIzMDU2MDg0Cn0.zw_wFQ-wvrWmfPLGj3hAUWn-GOHkiJZi2but4KV0paY"'
-)
+ '"http://somehost/someasset.ts?URISigningPackage=ewogICJ0eXAiOiAiSldUIiwKICAiYWxnIjogIkhTMjU2Igp9.ewogICJleHAiOiAxOTIzMDU2MDg0Cn0.zw_wFQ-wvrWmfPLGj3hAUWn-GOHkiJZi2but4KV0paY"',
+ ts=ts)
ps.ReturnCode = 0
ps.Streams.stderr = "gold/403.gold"
ts.Disk.traffic_out.Content = Testers.ContainsExpression(
diff --git a/tests/gold_tests/pluginTest/url_sig/url_sig.test.py b/tests/gold_tests/pluginTest/url_sig/url_sig.test.py
index 1c5843ed23..c104c11cd4 100644
--- a/tests/gold_tests/pluginTest/url_sig/url_sig.test.py
+++ b/tests/gold_tests/pluginTest/url_sig/url_sig.test.py
@@ -103,7 +103,8 @@ tr.Processes.Default.StartBefore(server, ready=When.PortOpen(server.Variables.Po
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://seven.eight.nine/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.2&E=33046620008&A=2&K=13&P=101&S=d1f352d4f1d931ad2f441013402d93f8'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.2&E=33046620008&A=2&K=13&P=101&S=d1f352d4f1d931ad2f441013402d93f8'" + LogTee,
+ ts=ts)
# With client / MD5 / P=010 / URL pristine / URL altered -- Expired.
#
@@ -111,7 +112,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://seven.eight.nine/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=1&A=2&K=13&P=010&S=f237aad1fa010234d7bf8108a0e36387'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=1&A=2&K=13&P=010&S=f237aad1fa010234d7bf8108a0e36387'" + LogTee,
+ ts=ts)
# With client / No algorithm / P=101 / URL pristine / URL altered.
#
@@ -119,7 +121,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://seven.eight.nine/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&K=13&P=101&S=d1f352d4f1d931ad2f441013402d93f8'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&K=13&P=101&S=d1f352d4f1d931ad2f441013402d93f8'" + LogTee,
+ ts=ts)
# With client / Bad algorithm / P=101 / URL pristine / URL altered.
#
@@ -127,7 +130,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://seven.eight.nine/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=3&K=13&P=101&S=d1f352d4f1d931ad2f441013402d93f8'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=3&K=13&P=101&S=d1f352d4f1d931ad2f441013402d93f8'" + LogTee,
+ ts=ts)
# With client / MD5 / No parts / URL pristine / URL altered.
#
@@ -135,7 +139,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://seven.eight.nine/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&K=13&S=d1f352d4f1d931ad2f441013402d93f8'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&K=13&S=d1f352d4f1d931ad2f441013402d93f8'" + LogTee,
+ ts=ts)
# With client / MD5 / P=10 (bad) / URL pristine / URL altered.
#
@@ -143,7 +148,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://seven.eight.nine/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&K=13&P=10&S=d1f352d4f1d931ad2f441013402d93f8'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&K=13&P=10&S=d1f352d4f1d931ad2f441013402d93f8'" + LogTee,
+ ts=ts)
# With client / MD5 / P=101 / URL pristine / URL altered -- No signature.
#
@@ -151,7 +157,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://seven.eight.nine/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&K=13&P=101'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&K=13&P=101'" + LogTee,
+ ts=ts)
# With client / MD5 / P=101 / URL pristine / URL altered -- Bad signature.
#
@@ -159,7 +166,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://seven.eight.nine/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&K=13&P=101&S=d1f452d4f1d931ad2f441013402d93f8'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&K=13&P=101&S=d1f452d4f1d931ad2f441013402d93f8'" + LogTee,
+ ts=ts)
# With client / MD5 / P=101 / URL pristine / URL altered -- Spurious &.
#
@@ -167,7 +175,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://seven.eight.nine/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&&K=13&P=101&S=d1f352d4f1d931ad2f441013402d93f8#'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&&K=13&P=101&S=d1f352d4f1d931ad2f441013402d93f8#'" + LogTee,
+ ts=ts)
# Success tests.
@@ -177,7 +186,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://four.five.six/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046618556&A=1&K=15&P=1&S=f4103561a23adab7723a89b9831d77e0afb61d92'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046618556&A=1&K=15&P=1&S=f4103561a23adab7723a89b9831d77e0afb61d92'" + LogTee,
+ ts=ts)
# No client / MD5 / P=1 / URL pristine / URL altered.
#
@@ -185,7 +195,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://seven.eight.nine/" +
- "foo/abcde/qrstuvwxyz?E=33046618586&A=2&K=0&P=1&S=0364efa28afe345544596705b92d20ac'" + LogTee)
+ "foo/abcde/qrstuvwxyz?E=33046618586&A=2&K=0&P=1&S=0364efa28afe345544596705b92d20ac'" + LogTee,
+ ts=ts)
# With client / MD5 / P=010 / URL pristine / URL altered.
#
@@ -193,7 +204,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://seven.eight.nine/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046619717&A=2&K=13&P=010&S=f237aad1fa010234d7bf8108a0e36387'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046619717&A=2&K=13&P=010&S=f237aad1fa010234d7bf8108a0e36387'" + LogTee,
+ ts=ts)
# With client / MD5 / P=101 / URL pristine / URL altered.
#
@@ -201,7 +213,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://seven.eight.nine/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&K=13&P=101&S=d1f352d4f1d931ad2f441013402d93f8'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&K=13&P=101&S=d1f352d4f1d931ad2f441013402d93f8'" + LogTee,
+ ts=ts)
def sign(payload, key):
@@ -219,7 +232,7 @@ url = "http://one.two.three/" + path + sign(to_sign, "dqsgopTSM_doT6iAysasQVUKaP
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
-tr.MakeCurlCommand(f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} '{url}'" + LogTee)
+tr.MakeCurlCommand(f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} '{url}'" + LogTee, ts=ts)
# With client / MD5 / P=101 / URL pristine / URL altered.
# uses url_type pristine in config
@@ -227,7 +240,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://ten.eleven.twelve/" +
- "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&K=13&P=101&S=586ef8e808caeeea025c525c89ff2638'" + LogTee)
+ "foo/abcde/qrstuvwxyz?C=127.0.0.1&E=33046620008&A=2&K=13&P=101&S=586ef8e808caeeea025c525c89ff2638'" + LogTee,
+ ts=ts)
# Single fail test - check for bad path param inserted
# With client / MD5 / P=101 / URL pristine / URL altered. Bad Path Param
@@ -236,7 +250,8 @@ tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://ten.eleven.twelve/" +
- "foo/abcde/qrstuvwxyz;badparam=true?C=127.0.0.1&E=33046620008&A=2&K=13&P=101&S=586ef8e808caeeea025c525c89ff2638'" + LogTee)
+ "foo/abcde/qrstuvwxyz;badparam=true?C=127.0.0.1&E=33046620008&A=2&K=13&P=101&S=586ef8e808caeeea025c525c89ff2638'" + LogTee,
+ ts=ts)
# Success
# With client / SHA1 / P=1 / URL pristine / URL altered. Base64 Encoded Path Param
@@ -245,7 +260,8 @@ tr.Processes.Default.ReturnCode = 0
tr.MakeCurlCommand(
f"--verbose --proxy http://127.0.0.1:{ts.Variables.port} 'http://ten.eleven.twelve/" +
"foo/abcde;urlsig=Qz0xMjcuMC4wLjE7RT0zMzA0NjYyMDAwODtBPTI7Sz0xMztQPTEwMTtTPTA1MDllZjljY2VlNjUxZWQ1OTQxM2MyZjE3YmVhODZh/qrstuvwxyz'"
- + LogTee)
+ + LogTee,
+ ts=ts)
# Success
# This test must be last since it converts from the long to the short log output
@@ -257,9 +273,10 @@ url = f"https://127.0.0.1:{ts.Variables.ssl_port}/{path}" + sign(to_sign, "dqsgo
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
-tr.MakeCurlCommand(
- f"--verbose --http1.1 --insecure --header 'Host: one.two.three' '{url}'" + LogTee +
- " ; grep -F -e '< HTTP' -e Authorization {0}/url_sig_long.log > {0}/url_sig_short.log ".format(ts.RunDirectory))
+tr.MakeCurlCommandMulti(
+ f"{{curl_base}} --verbose --http1.1 --insecure --header 'Host: one.two.three' '{url}'" + LogTee +
+ " ; grep -F -e '< HTTP' -e Authorization {0}/url_sig_long.log > {0}/url_sig_short.log ".format(ts.RunDirectory),
+ ts=ts)
# Overriding the built in ERROR check since we expect some ERROR messages
ts.Disk.diags_log.Content = Testers.ContainsExpression("ERROR", "Some tests are failure tests")
diff --git a/tests/gold_tests/post/post-continue.test.py b/tests/gold_tests/post/post-continue.test.py
index 20f43e8a4d..5dfd75044c 100644
--- a/tests/gold_tests/post/post-continue.test.py
+++ b/tests/gold_tests/post/post-continue.test.py
@@ -25,6 +25,7 @@ Test.Summary = '''
Test the Expect header in post
'''
# Require HTTP/2 enabled Curl
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
Test.SkipUnless(Condition.HasCurlFeature('http2'),)
Test.ContinueOnFail = True
@@ -75,7 +76,8 @@ test_run.Processes.Default.StartBefore(server)
test_run.Processes.Default.StartBefore(ts)
test_run.MakeCurlCommand(
'-v -o /dev/null --http1.1 -H "uuid: post" -H "Expect: 100-continue" -d "small body" -k https://127.0.0.1:{0}/post'.format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
test_run.Processes.Default.Streams.All = "gold/post-h1.gold"
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("HTTP/1.1 100 continue", "Has Expect header")
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("Expect: 100-continue", "Has Expect header")
@@ -86,7 +88,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http1.1 POST large body with Expect header")
test_run.MakeCurlCommand(
'-v -o /dev/null --http1.1 -H "uuid: post" -H "Expect: 100-continue" -d @big_post_body -k https://127.0.0.1:{0}/post'.format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
test_run.Processes.Default.Streams.All = "gold/post-h1.gold"
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("HTTP/1.1 100 continue", "Has Expect header")
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("Expect: 100-continue", "Has Expect header")
@@ -97,7 +100,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http1.1 POST small body w/o Expect header")
test_run.MakeCurlCommand(
'-v -o /dev/null --http1.1 -H "uuid: post" -H "Expect:" -d "small body" -k https://127.0.0.1:{0}/post'.format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
test_run.Processes.Default.Streams.All = "gold/post-h1.gold"
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("HTTP/1.1 100 continue", "Does not have Expect header")
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("Expect: 100-continue", "Does not have Expect header")
@@ -108,7 +112,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http1.1 POST large body w/o Expect header")
test_run.MakeCurlCommand(
'-v -o /dev/null --http1.1 -H "uuid: post" -H "Expect: " -d @big_post_body -k https://127.0.0.1:{0}/post'.format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
test_run.Processes.Default.Streams.All = "gold/post-h1.gold"
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("HTTP/1.1 100 continue", "Does not have Expect header")
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("Expect: 100-continue", "Does not have Expect header")
@@ -119,7 +124,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http2 POST small body with Expect header")
test_run.MakeCurlCommand(
'-v -o /dev/null --http2 -H "uuid: post" -H "Expect: 100-continue" -d "small body" -k https://127.0.0.1:{0}/post'.format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
test_run.Processes.Default.Streams.All = "gold/post-h2.gold"
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("xpect: 100-continue", "Has expect header")
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("HTTP/2 100", "Has Expect header")
@@ -130,7 +136,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http2 POST large body with Expect header")
test_run.MakeCurlCommand(
'-v -o /dev/null --http2 -H "uuid: post" -H "Expect: 100-continue" -d @big_post_body -k https://127.0.0.1:{0}/post'.format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
test_run.Processes.Default.Streams.All = "gold/post-h2.gold"
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("xpect: 100-continue", "Has expect header")
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("HTTP/2 100", "Has Expect header")
@@ -141,7 +148,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http2 POST small body w/o Expect header")
test_run.MakeCurlCommand(
'-v -o /dev/null --http2 -H "uuid: post" -H "Expect: " -d "small body" -k https://127.0.0.1:{0}/post'.format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
test_run.Processes.Default.Streams.All = "gold/post-h2.gold"
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("xpect: 100-continue", "Has expect header")
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("HTTP/2 100", "Has Expect header")
@@ -152,7 +160,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http2 POST large body w/o Expect header")
test_run.MakeCurlCommand(
'-v -o /dev/null --http2 -H "uuid: post" -H "Expect: " -d @big_post_body -k https://127.0.0.1:{0}/post'.format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
test_run.Processes.Default.Streams.All = "gold/post-h2.gold"
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("xpect: 100-continue", "Has expect header")
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("HTTP/2 100", "Has Expect header")
@@ -165,7 +174,8 @@ test_run = Test.AddTestRun("http1.1 POST small body with Expect header, immediat
test_run.Processes.Default.StartBefore(Test.Processes.ts2)
test_run.MakeCurlCommand(
'-v -o /dev/null --http1.1 -H "uuid: post" -H "Expect: 100-continue" -d "small body" -k https://127.0.0.1:{0}/post'.format(
- ts2.Variables.ssl_port))
+ ts2.Variables.ssl_port),
+ ts=ts2)
test_run.Processes.Default.Streams.All = "gold/post-h1.gold"
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("HTTP/1.1 100 Continue", "Has Expect header")
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("Expect: 100-continue", "Has Expect header")
@@ -176,7 +186,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http1.1 POST large body with Expect header, immediate")
test_run.MakeCurlCommand(
'-v -o /dev/null --http1.1 -H "uuid: post" -H "Expect: 100-continue" -d @big_post_body -k https://127.0.0.1:{0}/post'.format(
- ts2.Variables.ssl_port))
+ ts2.Variables.ssl_port),
+ ts=ts2)
test_run.Processes.Default.Streams.All = "gold/post-h1.gold"
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("HTTP/1.1 100 Continue", "Has Expect header")
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("Expect: 100-continue", "Has Expect header")
@@ -187,7 +198,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http1.1 POST small body w/o Expect header, immediate")
test_run.MakeCurlCommand(
'-v -o /dev/null --http1.1 -H "uuid: post" -H "Expect:" -d "small body" -k https://127.0.0.1:{0}/post'.format(
- ts2.Variables.ssl_port))
+ ts2.Variables.ssl_port),
+ ts=ts2)
test_run.Processes.Default.Streams.All = "gold/post-h1.gold"
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("HTTP/1.1 100 Continue", "Has Expect header")
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("Expect 100-continue", "Has Expect header")
@@ -198,7 +210,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http1.1 POST large body w/o Expect header, immediate")
test_run.MakeCurlCommand(
'-v -o /dev/null --http1.1 -H "uuid: post" -H "Expect: " -d @big_post_body -k https://127.0.0.1:{0}/post'.format(
- ts2.Variables.ssl_port))
+ ts2.Variables.ssl_port),
+ ts=ts2)
test_run.Processes.Default.Streams.All = "gold/post-h1.gold"
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("HTTP/1.1 100 Continue", "Has Expect header")
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("Expect 100-continue", "Has Expect header")
@@ -209,7 +222,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http2 POST small body with Expect header, immediate")
test_run.MakeCurlCommand(
'-v -o /dev/null --http2 -H "uuid: post" -H "Expect: 100-continue" -d "small body" -k https://127.0.0.1:{0}/post'.format(
- ts2.Variables.ssl_port))
+ ts2.Variables.ssl_port),
+ ts=ts2)
test_run.Processes.Default.Streams.All = "gold/post-h2.gold"
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("xpect: 100-continue", "Has expect header")
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("HTTP/2 100", "Has Expect header")
@@ -220,7 +234,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http2 POST large body with Expect header, immediate")
test_run.MakeCurlCommand(
'-v -o /dev/null --http2 -H "uuid: post" -H "Expect: 100-continue" -d @big_post_body -k https://127.0.0.1:{0}/post'.format(
- ts2.Variables.ssl_port))
+ ts2.Variables.ssl_port),
+ ts=ts2)
test_run.Processes.Default.Streams.All = "gold/post-h2.gold"
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("xpect: 100-continue", "Has expect header")
test_run.Processes.Default.Streams.All += Testers.ContainsExpression("HTTP/2 100", "Has Expect header")
@@ -231,7 +246,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http2 POST small body w/o Expect header, immediate")
test_run.MakeCurlCommand(
'-v -o /dev/null --http2 -H "uuid: post" -H "Expect: " -d "small body" -k https://127.0.0.1:{0}/post'.format(
- ts2.Variables.ssl_port))
+ ts2.Variables.ssl_port),
+ ts=ts2)
test_run.Processes.Default.Streams.All = "gold/post-h2.gold"
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("xpect: 100-continue", "Has expect header")
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("HTTP/2 100", "Has Expect header")
@@ -242,7 +258,8 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http2 POST large body w/o Expect header, immediate")
test_run.MakeCurlCommand(
'-v -o /dev/null --http2 -H "uuid: post" -H "Expect: " -d @big_post_body -k https://127.0.0.1:{0}/post'.format(
- ts2.Variables.ssl_port))
+ ts2.Variables.ssl_port),
+ ts=ts2)
test_run.Processes.Default.Streams.All = "gold/post-h2.gold"
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("xpect: 100-continue", "Has expect header")
test_run.Processes.Default.Streams.All += Testers.ExcludesExpression("HTTP/2 100", "Has Expect header")
diff --git a/tests/gold_tests/post/post-early-return.test.py b/tests/gold_tests/post/post-early-return.test.py
index cbf447e3c8..82879eb401 100644
--- a/tests/gold_tests/post/post-early-return.test.py
+++ b/tests/gold_tests/post/post-early-return.test.py
@@ -24,6 +24,7 @@ import os
Test.Summary = '''
Test a case when the origin returns before the post is completed
'''
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
Test.ContinueOnFail = True
Test.GetTcpPort("upstream_port1")
@@ -83,7 +84,8 @@ big_post_body_file.close()
test_run = Test.AddTestRun("http1.1 Post with small body early return")
test_run.Processes.Default.StartBefore(Test.Processes.ts)
test_run.Processes.Default.StartBefore(server1)
-test_run.MakeCurlCommand('-v -o /dev/null --http1.1 -d "small body" -k https://127.0.0.1:{}/one'.format(ts.Variables.ssl_port))
+test_run.MakeCurlCommand(
+ '-v -o /dev/null --http1.1 -d "small body" -k https://127.0.0.1:{}/one'.format(ts.Variables.ssl_port), ts=ts)
test_run.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/1.1 420 Be Calm", "Receive the early response")
test_run.StillRunningAfter = ts
test_run.Processes.Default.ReturnCode = 0
@@ -91,14 +93,15 @@ test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http1.1 Post with large body early return")
test_run.Processes.Default.StartBefore(server2)
test_run.MakeCurlCommand(
- '-H "Expect:" -v -o /dev/null --http1.1 -d @big_post_body -k https://127.0.0.1:{}/two'.format(ts.Variables.ssl_port))
+ '-H "Expect:" -v -o /dev/null --http1.1 -d @big_post_body -k https://127.0.0.1:{}/two'.format(ts.Variables.ssl_port), ts=ts)
test_run.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/1.1 420 Be Calm", "Receive the early response")
test_run.StillRunningAfter = ts
test_run.Processes.Default.ReturnCode = 0
test_run = Test.AddTestRun("http2 Post with large body, small window and early return")
test_run.Processes.Default.StartBefore(server3)
-test_run.MakeCurlCommand('-v -o /dev/null --http2 -d @big_post_body -k https://127.0.0.1:{}/three'.format(ts.Variables.ssl_port))
+test_run.MakeCurlCommand(
+ '-v -o /dev/null --http2 -d @big_post_body -k https://127.0.0.1:{}/three'.format(ts.Variables.ssl_port), ts=ts)
test_run.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 420", "Receive the early response")
test_run.StillRunningAfter = ts
test_run.Processes.Default.ReturnCode = 0
diff --git a/tests/gold_tests/post_slow_server/post_slow_server.test.py b/tests/gold_tests/post_slow_server/post_slow_server.test.py
index c51f88c71e..4447eb938b 100644
--- a/tests/gold_tests/post_slow_server/post_slow_server.test.py
+++ b/tests/gold_tests/post_slow_server/post_slow_server.test.py
@@ -52,7 +52,8 @@ server = Test.Processes.Process("server", "bash -c '" + Test.TestDirectory + "/s
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'--request POST --verbose --ipv4 --http2 --insecure --header "Content-Length: 0"' +
- " --header 'Host: localhost' https://localhost:{}/xyz >curl.log 2>curl.err".format(ts.Variables.ssl_port))
+ " --header 'Host: localhost' https://localhost:{}/xyz >curl.log 2>curl.err".format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
diff --git a/tests/gold_tests/post_slow_server/post_slow_server_max_requests_in.test.py b/tests/gold_tests/post_slow_server/post_slow_server_max_requests_in.test.py
index f18d83a290..5397e23d6a 100644
--- a/tests/gold_tests/post_slow_server/post_slow_server_max_requests_in.test.py
+++ b/tests/gold_tests/post_slow_server/post_slow_server_max_requests_in.test.py
@@ -41,7 +41,7 @@ class PostAndMaxRequestsInTest:
self.ts.Disk.records_config.update(
{
- "proxy.config.http.server_ports": f"{self.ts.Variables.port}",
+ "proxy.config.http.server_ports": f"{self.ts.Variables.port} {self.ts.Variables.uds_path}",
"proxy.config.net.max_requests_in": 1000,
'proxy.config.http.connect_attempts_timeout': 1,
"proxy.config.diags.debug.enabled": 1,
@@ -61,7 +61,7 @@ class PostAndMaxRequestsInTest:
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(self.origin_server)
tr.Processes.Default.StartBefore(self.ts)
- tr.MakeCurlCommand(f"-X POST --http1.1 -vs http://127.0.0.1:{self.ts.Variables.port}/ --data key=value")
+ tr.MakeCurlCommand(f"-X POST --http1.1 -vs http://127.0.0.1:{self.ts.Variables.port}/ --data key=value", ts=self.ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/post_slow_server_max_requests_in_0_stdout.gold"
tr.Processes.Default.Streams.stderr = "gold/post_slow_server_max_requests_in_0_stderr.gold"
diff --git a/tests/gold_tests/proxy_protocol/proxy_serve_stale_dns_fail.test.py b/tests/gold_tests/proxy_protocol/proxy_serve_stale_dns_fail.test.py
index 07235ed4c3..3e6624d1d8 100644
--- a/tests/gold_tests/proxy_protocol/proxy_serve_stale_dns_fail.test.py
+++ b/tests/gold_tests/proxy_protocol/proxy_serve_stale_dns_fail.test.py
@@ -20,7 +20,7 @@ Test proxy serving stale content when DNS lookup fails
Test.ContinueOnFail = True
# Set up hierarchical caching processes
ts_child = Test.MakeATSProcess("ts_child")
-ts_parent = Test.MakeATSProcess("ts_parent")
+ts_parent = Test.MakeATSProcess("ts_parent", enable_uds=False)
nameserver = Test.MakeDNServer("dns")
server_name = "http://unknown.domain.com/"
@@ -65,13 +65,13 @@ child_curl_request = (
f'sleep 7; {{curl}} -s -v http://localhost:{ts_child.Variables.port};'
f'sleep 17; {{curl}} -s -v http://localhost:{ts_child.Variables.port};'
# Test parent serving stale with failed DNS OS lookup
- f'{{curl}} -X PUSH -d "{stale_5}" "http://localhost:{ts_parent.Variables.port}";'
- f'sleep 7; {{curl}} -s -v http://localhost:{ts_parent.Variables.port};'
- f'sleep 17; {{curl}} -s -v http://localhost:{ts_parent.Variables.port};')
+ f'{{curl_base}} -X PUSH -d "{stale_5}" "http://localhost:{ts_parent.Variables.port}";'
+ f'sleep 7; {{curl_base}} -s -v http://localhost:{ts_parent.Variables.port};'
+ f'sleep 17; {{curl_base}} -s -v http://localhost:{ts_parent.Variables.port};')
# Test case for when parent server is down but child proxy can serve cache object
tr = Test.AddTestRun()
-tr.MakeCurlCommandMulti(child_curl_request)
+tr.MakeCurlCommandMulti(child_curl_request, ts=ts_child)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(ts_child)
tr.Processes.Default.StartBefore(ts_parent)
diff --git a/tests/gold_tests/redirect/gold/number_of_redirections_0.gold b/tests/gold_tests/redirect/gold/number_of_redirections_0.gold
index 66e43b735f..7587005db3 100644
--- a/tests/gold_tests/redirect/gold/number_of_redirections_0.gold
+++ b/tests/gold_tests/redirect/gold/number_of_redirections_0.gold
@@ -1,9 +1,9 @@
``
-> GET http://a.test/ping HTTP/1.1
+> GET ``ping HTTP/1.1
> Host: a.test
> User-Agent: curl/``
> Accept: */*
-> Proxy-Connection: Keep-Alive
+``
> uuid: redirect_test_1
``
< HTTP/1.1 302 Redirect
@@ -11,7 +11,7 @@
< Date: ``
< Age: ``
< Transfer-Encoding: chunked
-< Proxy-Connection: keep-alive
+< ``Connection: keep-alive
< Server: ATS/``
``
< HTTP/1.1 302 Redirect
@@ -19,20 +19,20 @@
< Date: ``
< Age: ``
< Transfer-Encoding: chunked
-< Proxy-Connection: keep-alive
+< ``Connection: keep-alive
< Server: ATS/``
``
-> GET http://c.test:``
+> GET ``
> Host: c.test:``
> User-Agent: curl/``
> Accept: */*
-> Proxy-Connection: Keep-Alive
+``
> uuid: redirect_test_1
``
< HTTP/1.1 200 OK
< date: ``
< Age: ``
< Transfer-Encoding: chunked
-< Proxy-Connection: keep-alive
+< ``Connection: keep-alive
< Server: ATS/``
``
\ No newline at end of file
diff --git a/tests/gold_tests/redirect/gold/number_of_redirections_2.gold b/tests/gold_tests/redirect/gold/number_of_redirections_2.gold
index 86360afb3c..7de7c35eba 100644
--- a/tests/gold_tests/redirect/gold/number_of_redirections_2.gold
+++ b/tests/gold_tests/redirect/gold/number_of_redirections_2.gold
@@ -1,15 +1,15 @@
``
-> GET http://a.test/ping HTTP/1.1
+> GET ``/ping HTTP/1.1
> Host: a.test
> User-Agent: curl/``
> Accept: */*
-> Proxy-Connection: Keep-Alive
+``
> uuid: redirect_test_1
``
< HTTP/1.1 200 OK
< date: ``
< Age: ``
< Transfer-Encoding: chunked
-< Proxy-Connection: keep-alive
+< ``Connection: keep-alive
< Server: ATS/``
``
\ No newline at end of file
diff --git a/tests/gold_tests/redirect/number_of_redirects.test.py b/tests/gold_tests/redirect/number_of_redirects.test.py
index 2c4b8108ee..e948dc6206 100644
--- a/tests/gold_tests/redirect/number_of_redirects.test.py
+++ b/tests/gold_tests/redirect/number_of_redirects.test.py
@@ -84,7 +84,7 @@ class NumberOfRedirectionsTest:
self._tr.Processes.Default.StartBefore(self._dns)
self._tr.Processes.Default.StartBefore(self._ts)
self._tr.MakeCurlCommand(
- "-L -v a.test/ping --proxy 127.0.0.1:{0} -H 'uuid: redirect_test_1'".format(self._ts.Variables.port))
+ "-L -v a.test/ping --proxy 127.0.0.1:{0} -H 'uuid: redirect_test_1'".format(self._ts.Variables.port), ts=self._ts)
self._tr.Processes.Default.Streams.All = f"gold/number_of_redirections_{self._numberOfRedirections}.gold"
self._tr.ReturnCode = 0
self._tr.StillRunningAfter = self._ts
diff --git a/tests/gold_tests/redirect/redirect_post.test.py b/tests/gold_tests/redirect/redirect_post.test.py
index 84a8d6fd06..8d1d3d545c 100644
--- a/tests/gold_tests/redirect/redirect_post.test.py
+++ b/tests/gold_tests/redirect/redirect_post.test.py
@@ -79,8 +79,9 @@ ts.Disk.remap_config.AddLine(
tr = Test.AddTestRun()
tr.MakeCurlCommandMulti(
- 'touch largefile.txt && truncate largefile.txt -s 50M && {{curl}} -H "Expect: " -i http://127.0.0.1:{0}/redirect1 -F "filename=@./largefile.txt" && rm -f largefile.txt'
- .format(ts.Variables.port))
+ 'touch largefile.txt && truncate -s 50M largefile.txt && {{curl}} -H "Expect: " -i http://127.0.0.1:{0}/redirect1 -F "filename=@./largefile.txt" && rm -f largefile.txt'
+ .format(ts.Variables.port),
+ ts=ts)
tr.TimeOut = 10
tr.Processes.Default.StartBefore(ts)
tr.Processes.Default.StartBefore(redirect_serv1)
diff --git a/tests/gold_tests/remap/basic_conf_remap_yaml.test.py b/tests/gold_tests/remap/basic_conf_remap_yaml.test.py
index d42639348a..22b7e930c9 100644
--- a/tests/gold_tests/remap/basic_conf_remap_yaml.test.py
+++ b/tests/gold_tests/remap/basic_conf_remap_yaml.test.py
@@ -114,16 +114,24 @@ class conf_remap_yaml_load_test:
self._ts.Disk.remap_config.AddLine(
f'map http://www.testexample.com/ http://127.0.0.1:{self._server.Variables.Port} @plugin=conf_remap.so @pparam={self._remap_filename}'
)
-
- tr.MakeCurlCommand(
- '--proxy 127.0.0.1:{0} "http://www.testexample.com/test" -H "Host: www.testexample.com" --verbose'.format(
- self._ts.Variables.port))
+ if Condition.CurlUsingUnixDomainSocket():
+ tr.MakeCurlCommand(
+ '-H "Host: www.testexample.com" "http://127.0.0.1:{0}/test" --verbose'.format(self._ts.Variables.port), ts=self._ts)
+ else:
+ tr.MakeCurlCommand(
+ '--proxy 127.0.0.1:{0} "http://www.testexample.com/test" -H "Host: www.testexample.com" --verbose'.format(
+ self._ts.Variables.port),
+ ts=self._ts)
conf_remap_yaml_load_test.client_counter += 1
+gold_file = "gold/200OK_test.gold"
+if Condition.CurlUsingUnixDomainSocket():
+ gold_file = "gold/200OK_test_uds.gold"
+
test0 = conf_remap_yaml_load_test(
"Test success",
- gold_file="gold/200OK_test.gold",
+ gold_file=gold_file,
remap_filename="testexample_remap.yaml",
remap_content='''
records:
@@ -158,7 +166,7 @@ test2.run(
# We let the conf_remap parse two fields, only one is valid, we expect ATS to start and the invalid fields ignored.
test3 = conf_remap_yaml_load_test(
"Test success",
- gold_file="gold/200OK_test.gold",
+ gold_file=gold_file,
remap_filename="testexample2_remap.yaml",
remap_content='''
records:
@@ -173,7 +181,7 @@ test3.run(diags_fail_exp="'proxy.config.plugin.dynamic_reload_mode' is not a con
# Check null values
test4 = conf_remap_yaml_load_test(
"Test success - with NULL variable",
- gold_file="gold/200OK_test.gold",
+ gold_file=gold_file,
remap_filename="testexample_remap.yaml",
remap_content='''
records:
diff --git a/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-l_value.gold b/tests/gold_tests/remap/gold/200OK_test_uds.gold
similarity index 51%
copy from tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-l_value.gold
copy to tests/gold_tests/remap/gold/200OK_test_uds.gold
index 8c3cf6649a..5d588e039e 100644
--- a/tests/gold_tests/pluginTest/header_rewrite/gold/header_rewrite-l_value.gold
+++ b/tests/gold_tests/remap/gold/200OK_test_uds.gold
@@ -1,6 +1,6 @@
``
-> GET http://www.example.com``
-> Host: www.example.com``
+> GET /test``
+> Host: www.testexample.com``
> User-Agent: curl/``
> Accept: */*
``
@@ -8,9 +8,6 @@
< Date: ``
< Age: ``
< Transfer-Encoding: chunked
-< Proxy-Connection: keep-alive
+< Connection: keep-alive
< Server: ATS/``
-< X-First: First
-< X-Last: Last
-<
``
diff --git a/tests/gold_tests/remap/gold/remap-ws-metrics-uds.gold b/tests/gold_tests/remap/gold/remap-ws-metrics-uds.gold
new file mode 100644
index 0000000000..d88a74be33
--- /dev/null
+++ b/tests/gold_tests/remap/gold/remap-ws-metrics-uds.gold
@@ -0,0 +1,21 @@
+proxy.process.http.total_incoming_connections 2
+proxy.process.http.total_client_connections 2
+proxy.process.http.total_client_connections_ipv4 0
+proxy.process.http.total_client_connections_ipv6 0
+proxy.process.http.total_server_connections 1
+proxy.process.http2.total_client_connections 0
+proxy.process.http.connect_requests 0
+proxy.process.tunnel.total_client_connections_blind_tcp 1
+proxy.process.tunnel.current_client_connections_blind_tcp 0
+proxy.process.tunnel.total_server_connections_blind_tcp 1
+proxy.process.tunnel.current_server_connections_blind_tcp 0
+proxy.process.tunnel.total_client_connections_tls_tunnel 0
+proxy.process.tunnel.current_client_connections_tls_tunnel 0
+proxy.process.tunnel.total_client_connections_tls_forward 0
+proxy.process.tunnel.current_client_connections_tls_forward 0
+proxy.process.tunnel.total_client_connections_tls_partial_blind 0
+proxy.process.tunnel.current_client_connections_tls_partial_blind 0
+proxy.process.tunnel.total_client_connections_tls_http 0
+proxy.process.tunnel.current_client_connections_tls_http 0
+proxy.process.tunnel.total_server_connections_tls 0
+proxy.process.tunnel.current_server_connections_tls 0
diff --git a/tests/gold_tests/remap/regex_map.test.py b/tests/gold_tests/remap/regex_map.test.py
index b030ac949f..64b70bbb15 100644
--- a/tests/gold_tests/remap/regex_map.test.py
+++ b/tests/gold_tests/remap/regex_map.test.py
@@ -50,7 +50,7 @@ ts.Disk.remap_config.AddLine(
r'https://www.example.com:{}/one/two/three/blah12345.html'.format(server.Variables.Port))
tr = Test.AddTestRun()
-tr.MakeCurlCommand('-H"Host: zero.one.two.three.com" http://127.0.0.1:{0}/ --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand('-H"Host: zero.one.two.three.com" http://127.0.0.1:{0}/ --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(dns)
diff --git a/tests/gold_tests/remap/remap_http.test.py b/tests/gold_tests/remap/remap_http.test.py
index 9d573c056d..446071fa87 100644
--- a/tests/gold_tests/remap/remap_http.test.py
+++ b/tests/gold_tests/remap/remap_http.test.py
@@ -66,7 +66,7 @@ dns.addRecords(records={"whatever.com.": ["127.0.0.1"]})
# call localhost straight
tr = Test.AddTestRun()
-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)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(dns)
@@ -77,73 +77,78 @@ tr.StillRunningAfter = server
# www.example.com host
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--proxy 127.0.0.1:{0} "http://www.example.com" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port))
+ '--proxy 127.0.0.1:{0} "http://www.example.com" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-200.gold"
# www.example2.com host (match on receive port)
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--proxy 127.0.0.1:{0} "http://www.example2.com" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port))
+ '--proxy 127.0.0.1:{0} "http://www.example2.com" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap2-200.gold"
# www.example.com:80 host
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- ' --proxy 127.0.0.1:{0} "http://www.example.com:80/" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port))
+ ' --proxy 127.0.0.1:{0} "http://www.example.com:80/" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-200.gold"
# www.example.com:8080 host
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- ' --proxy 127.0.0.1:{0} "http://www.example.com:8080" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port))
+ ' --proxy 127.0.0.1:{0} "http://www.example.com:8080" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-200.gold"
# no rule for this
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- ' --proxy 127.0.0.1:{0} "http://www.test.com/" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port))
+ ' --proxy 127.0.0.1:{0} "http://www.test.com/" -H "Proxy-Connection: keep-alive" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-404.gold"
# redirect result
tr = Test.AddTestRun()
-tr.MakeCurlCommand(' --proxy 127.0.0.1:{0} "http://test3.com" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(' --proxy 127.0.0.1:{0} "http://test3.com" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-redirect.gold"
# referer hit
tr = Test.AddTestRun()
-tr.MakeCurlCommand(' --proxy 127.0.0.1:{0} "http://test4.com" --header "Referer: persia.com" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ ' --proxy 127.0.0.1:{0} "http://test4.com" --header "Referer: persia.com" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-referer-hit.gold"
# referer miss
tr = Test.AddTestRun()
-tr.MakeCurlCommand(' --proxy 127.0.0.1:{0} "http://test4.com" --header "Referer: monkey.com" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ ' --proxy 127.0.0.1:{0} "http://test4.com" --header "Referer: monkey.com" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-referer-miss.gold"
# referer hit
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- ' --proxy 127.0.0.1:{0} "http://test4.com" --header "Referer: www.persia.com" --verbose'.format(ts.Variables.port))
+ ' --proxy 127.0.0.1:{0} "http://test4.com" --header "Referer: www.persia.com" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-referer-hit.gold"
# DNS test
tr = Test.AddTestRun()
-tr.MakeCurlCommand(' --proxy 127.0.0.1:{0} "http://testDNS.com" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(' --proxy 127.0.0.1:{0} "http://testDNS.com" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-DNS-200.gold"
# microserver lookup test
tr = Test.AddTestRun()
tr.MakeCurlCommand(
- '--proxy 127.0.0.1:{0} "http://www.testexample.com/test" -H "Host: www.testexample.com" --verbose'.format(ts.Variables.port))
+ '--proxy 127.0.0.1:{0} "http://www.testexample.com/test" -H "Host: www.testexample.com" --verbose'.format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server2)
tr.Processes.Default.Streams.stderr = "gold/lookupTest.gold"
diff --git a/tests/gold_tests/remap/remap_https.test.py b/tests/gold_tests/remap/remap_https.test.py
index 02375286e3..19f74ae830 100644
--- a/tests/gold_tests/remap/remap_https.test.py
+++ b/tests/gold_tests/remap/remap_https.test.py
@@ -20,6 +20,7 @@ Test.Summary = '''
Test a basic remap of a http connection
'''
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
Test.ContinueOnFail = True
# Define default ATS
ts = Test.MakeATSProcess("ts", enable_tls=True)
@@ -60,7 +61,7 @@ ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key
# call localhost straight
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--http1.1 -k https://127.0.0.1:{0} --verbose'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('--http1.1 -k https://127.0.0.1:{0} --verbose'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
@@ -72,43 +73,47 @@ tr.StillRunningAfter = ts
# www.example.com host
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--http1.1 -k https://127.0.0.1:{0} -H "Host: www.example.com" --verbose'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('--http1.1 -k https://127.0.0.1:{0} -H "Host: www.example.com" --verbose'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-https-200.gold"
# www.example.com:80 host
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--http1.1 -k https://127.0.0.1:{0} -H "Host: www.example.com:443" --verbose'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ '--http1.1 -k https://127.0.0.1:{0} -H "Host: www.example.com:443" --verbose'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-https-200.gold"
# www.example.com:8080 host
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--http1.1 -k https://127.0.0.1:{0} -H "Host: www.example.com:{0}" --verbose'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ '--http1.1 -k https://127.0.0.1:{0} -H "Host: www.example.com:{0}" --verbose'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-https-200.gold"
# www.example3.com (match on receive port)
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--http1.1 -k https://127.0.0.1:{0} -H "Host: www.example3.com" --verbose'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('--http1.1 -k https://127.0.0.1:{0} -H "Host: www.example3.com" --verbose'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-https-200_3.gold"
# no rule for this
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--http1.1 -k https://127.0.0.1:{0} -H "Host: www.test.com" --verbose'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('--http1.1 -k https://127.0.0.1:{0} -H "Host: www.test.com" --verbose'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-hitATS-404.gold"
# bad port
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--http1.1 -k https://127.0.0.1:{0} -H "Host: www.example.com:1234" --verbose'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ '--http1.1 -k https://127.0.0.1:{0} -H "Host: www.example.com:1234" --verbose'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-hitATS-404.gold"
# map www.anotherexample.com to https://<IP of microserver>.com
tr = Test.AddTestRun()
-tr.MakeCurlCommand('--http1.1 -k https://127.0.0.1:{0} -H "Host: www.anotherexample.com" --verbose'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ '--http1.1 -k https://127.0.0.1:{0} -H "Host: www.anotherexample.com" --verbose'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-https-200_2.gold"
tr.StillRunningAfter = server2
diff --git a/tests/gold_tests/remap/remap_ip_resolve.test.py b/tests/gold_tests/remap/remap_ip_resolve.test.py
index 4be4665b09..a8e1a1c818 100644
--- a/tests/gold_tests/remap/remap_ip_resolve.test.py
+++ b/tests/gold_tests/remap/remap_ip_resolve.test.py
@@ -57,7 +57,7 @@ dns.addRecords(records={"test.ipv4.only.com.": ["127.0.0.1"]})
dns.addRecords(records={"test.ipv6.only.com": ["127.0.0.1", "::1"]})
tr = Test.AddTestRun()
-tr.MakeCurlCommand(' --proxy 127.0.0.1:{0} "http://testDNS.com" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(' --proxy 127.0.0.1:{0} "http://testDNS.com" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(dns)
@@ -66,7 +66,7 @@ tr.Processes.Default.Streams.stderr = "gold/remap-DNS-200.gold"
tr.StillRunningAfter = server
tr = Test.AddTestRun()
-tr.MakeCurlCommand(' --proxy 127.0.0.1:{0} "http://testDNS2.com" --verbose'.format(ts.Variables.port))
+tr.MakeCurlCommand(' --proxy 127.0.0.1:{0} "http://testDNS2.com" --verbose'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server_v6)
tr.Processes.Default.Streams.stderr = "gold/remap-DNS-ipv6-200.gold"
diff --git a/tests/gold_tests/remap/remap_ws.test.py b/tests/gold_tests/remap/remap_ws.test.py
index bcd2842758..7ff630688c 100644
--- a/tests/gold_tests/remap/remap_ws.test.py
+++ b/tests/gold_tests/remap/remap_ws.test.py
@@ -53,23 +53,29 @@ ts.Disk.remap_config.AddLines(
ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key')
-# wss mapping
-tr = Test.AddTestRun()
-tr.Processes.Default.StartBefore(server)
-tr.Processes.Default.StartBefore(Test.Processes.ts, ready=1)
-tr.MakeCurlCommand(
- '--max-time 2 -v -s -q -H "Connection: Upgrade" -H "Upgrade: websocket" -H "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==" -H "Sec-WebSocket-Version: 13" --http1.1 --resolve www.example.com:{0}:127.0.0.1 -k https://www.example.com:{0}/chat'
- .format(ts.Variables.ssl_port))
-tr.Processes.Default.ReturnCode = 28
-tr.Processes.Default.Streams.stderr = "gold/remap-ws-upgrade.gold"
-tr.StillRunningAfter = server
-tr.StillRunningAfter = ts
+if not Condition.CurlUsingUnixDomainSocket():
+ # wss mapping
+ tr = Test.AddTestRun()
+ tr.Processes.Default.StartBefore(server)
+ tr.Processes.Default.StartBefore(Test.Processes.ts, ready=1)
+ tr.MakeCurlCommand(
+ '--max-time 2 -v -s -q -H "Connection: Upgrade" -H "Upgrade: websocket" -H "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==" -H "Sec-WebSocket-Version: 13" --http1.1 --resolve www.example.com:{0}:127.0.0.1 -k https://www.example.com:{0}/chat'
+ .format(ts.Variables.ssl_port),
+ ts=ts)
+ tr.Processes.Default.ReturnCode = 28
+ tr.Processes.Default.Streams.stderr = "gold/remap-ws-upgrade.gold"
+ tr.StillRunningAfter = server
+ tr.StillRunningAfter = ts
# ws mapping
tr = Test.AddTestRun()
+if Condition.CurlUsingUnixDomainSocket():
+ tr.Processes.Default.StartBefore(server)
+ tr.Processes.Default.StartBefore(Test.Processes.ts, ready=1)
tr.MakeCurlCommand(
'--max-time 2 -v -s -q -H "Connection: Upgrade" -H "Upgrade: websocket" -H "Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==" -H "Sec-WebSocket-Version: 13" --http1.1 --resolve www.example.com:{0}:127.0.0.1 -k http://www.example.com:{0}/chat'
- .format(ts.Variables.port))
+ .format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 28
tr.Processes.Default.Streams.stderr = "gold/remap-ws-upgrade.gold"
tr.StillRunningAfter = server
@@ -79,7 +85,8 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun()
tr.MakeCurlCommand(
'--max-time 2 -v -s -q -H "Connection: Upgrade" -H "Upgrade: websocket" --http1.1 --resolve www.example.com:{0}:127.0.0.1 -k http://www.example.com:{0}/chat'
- .format(ts.Variables.port))
+ .format(ts.Variables.port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/remap-ws-upgrade-400.gold"
tr.StillRunningAfter = server
diff --git a/tests/gold_tests/session_sharing/session_match.test.py b/tests/gold_tests/session_sharing/session_match.test.py
index ff330ea254..5844502a5f 100644
--- a/tests/gold_tests/session_sharing/session_match.test.py
+++ b/tests/gold_tests/session_sharing/session_match.test.py
@@ -90,7 +90,8 @@ class SessionMatchTest:
'{{curl}} -v -H\'Host: www.example.com\' -H\'Connection: close\' http://127.0.0.1:{port}/one &&'
'{{curl}} -v -H\'Host: www.example.com\' -H\'Connection: close\' http://127.0.0.1:{port}/two &&'
'{{curl}} -v -H\'Host: www.example.com\' -H\'Connection: close\' http://127.0.0.1:{port}/three'.format(
- port=self._ts.Variables.port))
+ port=self._ts.Variables.port),
+ ts=self._ts)
self._tr.Processes.Default.ReturnCode = 0
self._tr.Processes.Default.StartBefore(self._server)
self._tr.Processes.Default.StartBefore(self._ts)
diff --git a/tests/gold_tests/slow_post/server_abort.test.py b/tests/gold_tests/slow_post/server_abort.test.py
index aaf4e266ab..1004bcdb6a 100644
--- a/tests/gold_tests/slow_post/server_abort.test.py
+++ b/tests/gold_tests/slow_post/server_abort.test.py
@@ -20,6 +20,7 @@ import re
Test.Summary = '''
AuTest with bad configuration of microserver to simulate server aborting the connection unexpectedly
'''
+Test.SkipIf(Condition.CurlUsingUnixDomainSocket())
ts = Test.MakeATSProcess("ts", enable_tls=True)
# note the microserver by default is not configured to use ssl
server = Test.MakeOriginServer("server")
@@ -41,7 +42,7 @@ ts.Disk.records_config.update(
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
-tr.MakeCurlCommand("-v -k -H \")host: foo.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v -k -H \")host: foo.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/timeout/active_timeout.test.py b/tests/gold_tests/timeout/active_timeout.test.py
index 5b9a3947f2..5f5d1d52ec 100644
--- a/tests/gold_tests/timeout/active_timeout.test.py
+++ b/tests/gold_tests/timeout/active_timeout.test.py
@@ -31,8 +31,7 @@ response_header = {"headers": "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n", "t
server.addResponse("sessionfile.log", request_header, response_header)
-ts.addSSLfile("../tls/ssl/server.pem")
-ts.addSSLfile("../tls/ssl/server.key")
+ts.addDefaultSSLFiles()
ts.Disk.records_config.update(
{
@@ -49,18 +48,20 @@ ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key
tr = Test.AddTestRun("tr")
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
-tr.MakeCurlCommand('-i http://127.0.0.1:{0}/file'.format(ts.Variables.port))
+tr.MakeCurlCommand('-i http://127.0.0.1:{0}/file'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.Streams.stdout = Testers.ContainsExpression("Activity Timeout", "Request should fail with active timeout")
-tr2 = Test.AddTestRun("tr")
-tr2.MakeCurlCommand('-k -i --http1.1 https://127.0.0.1:{0}/file'.format(ts.Variables.ssl_port))
-tr2.Processes.Default.Streams.stdout = Testers.ContainsExpression("Activity Timeout", "Request should fail with active timeout")
+if not Condition.CurlUsingUnixDomainSocket():
+ tr2 = Test.AddTestRun("tr")
+ tr2.MakeCurlCommand('-k -i --http1.1 https://127.0.0.1:{0}/file'.format(ts.Variables.ssl_port), ts=ts)
+ tr2.Processes.Default.Streams.stdout = Testers.ContainsExpression("Activity Timeout", "Request should fail with active timeout")
-tr3 = Test.AddTestRun("tr")
-tr3.MakeCurlCommand('-k -i --http2 https://127.0.0.1:{0}/file'.format(ts.Variables.ssl_port))
-tr3.Processes.Default.Streams.stdout = Testers.ContainsExpression("Activity Timeout", "Request should fail with active timeout")
+ tr3 = Test.AddTestRun("tr")
+ tr3.MakeCurlCommand('-k -i --http2 https://127.0.0.1:{0}/file'.format(ts.Variables.ssl_port), ts=ts)
+ tr3.Processes.Default.Streams.stdout = Testers.ContainsExpression("Activity Timeout", "Request should fail with active timeout")
-if Condition.HasATSFeature('TS_HAS_QUICHE') and Condition.HasCurlFeature('http3'):
- tr4 = Test.AddTestRun("tr")
- tr4.MakeCurlCommand('-k -i --http3 https://localhost:{0}/file'.format(ts.Variables.ssl_port))
- tr4.Processes.Default.Streams.stdout = Testers.ContainsExpression("Activity Timeout", "Request should fail with active timeout")
+ if Condition.HasATSFeature('TS_HAS_QUICHE') and Condition.HasCurlFeature('http3'):
+ tr4 = Test.AddTestRun("tr")
+ tr4.MakeCurlCommand('-k -i --http3 https://localhost:{0}/file'.format(ts.Variables.ssl_port), ts=ts)
+ tr4.Processes.Default.Streams.stdout = Testers.ContainsExpression(
+ "Activity Timeout", "Request should fail with active timeout")
diff --git a/tests/gold_tests/timeout/conn_timeout.test.py b/tests/gold_tests/timeout/conn_timeout.test.py
index 1d5030fe1e..125b06465b 100644
--- a/tests/gold_tests/timeout/conn_timeout.test.py
+++ b/tests/gold_tests/timeout/conn_timeout.test.py
@@ -67,13 +67,13 @@ tr.Processes.Default.Command = 'echo start; sudo sh -x ./setupnetns.sh {0} {1}'.
# and the connect timeout should trigger with a 50x return. If the SYN handshake occurs, the
# no activity timeout would trigger, but not before the test timeout expires
tr = Test.AddTestRun("tr-blocking")
-tr.MakeCurlCommand('-i http://127.0.0.1:{0}/blocked {0}'.format(ts.Variables.port))
+tr.MakeCurlCommand('-i http://127.0.0.1:{0}/blocked {0}'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.TimeOut = 4
tr.Processes.Default.Streams.All = Testers.ContainsExpression(
"HTTP/1.1 502 internal error - server connection terminated", "Connect failed")
tr = Test.AddTestRun("tr-blocking-post")
-tr.MakeCurlCommand('-d "stuff" -i http://127.0.0.1:{0}/blocked {0}'.format(ts.Variables.port))
+tr.MakeCurlCommand('-d "stuff" -i http://127.0.0.1:{0}/blocked {0}'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.TimeOut = 4
tr.Processes.Default.Streams.All = Testers.ContainsExpression(
"HTTP/1.1 502 internal error - server connection terminated", "Connect failed")
diff --git a/tests/gold_tests/timeout/inactive_client_timeout.test.py b/tests/gold_tests/timeout/inactive_client_timeout.test.py
index 272cb2fdc4..6c0a06f3f2 100644
--- a/tests/gold_tests/timeout/inactive_client_timeout.test.py
+++ b/tests/gold_tests/timeout/inactive_client_timeout.test.py
@@ -19,13 +19,15 @@
Test.Summary = 'Testing ATS client inactivity timeout'
ts = Test.MakeATSProcess("ts", enable_tls=True)
-replay_file = "slow_server.yaml"
+if Condition.CurlUsingUnixDomainSocket():
+ replay_file = "slow_server_uds.yaml"
+else:
+ replay_file = "slow_server.yaml"
server = Test.MakeVerifierServerProcess("server", replay_file)
Test.ContinueOnFail = True
-ts.addSSLfile("../tls/ssl/server.pem")
-ts.addSSLfile("../tls/ssl/server.key")
+ts.addDefaultSSLFiles()
ts.Disk.records_config.update(
{
@@ -63,7 +65,8 @@ tr.Processes.Default.StartBefore(server)
client.Streams.All += Testers.ContainsExpression('x-response: 1', 'Verify that the first response is received')
client.Streams.All += Testers.ContainsExpression('x-response: 2', 'Verify that the second response is received')
-client.Streams.All += Testers.ContainsExpression('x-response: 3', 'Verify that the third response is received')
-client.Streams.All += Testers.ContainsExpression('x-response: 4', 'Verify that the fourth response is received')
-client.Streams.All += Testers.ContainsExpression('x-response: 5', 'Verify that the fifth response is received')
-client.Streams.All += Testers.ContainsExpression('x-response: 6', 'Verify that the sixth response is received')
+if not Condition.CurlUsingUnixDomainSocket():
+ client.Streams.All += Testers.ContainsExpression('x-response: 3', 'Verify that the third response is received')
+ client.Streams.All += Testers.ContainsExpression('x-response: 4', 'Verify that the fourth response is received')
+ client.Streams.All += Testers.ContainsExpression('x-response: 5', 'Verify that the fifth response is received')
+ client.Streams.All += Testers.ContainsExpression('x-response: 6', 'Verify that the sixth response is received')
diff --git a/tests/gold_tests/timeout/inactive_timeout.test.py b/tests/gold_tests/timeout/inactive_timeout.test.py
index 94ccde20f9..c1fc3d8ed0 100644
--- a/tests/gold_tests/timeout/inactive_timeout.test.py
+++ b/tests/gold_tests/timeout/inactive_timeout.test.py
@@ -28,8 +28,7 @@ response_header = {"headers": "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n", "t
server.addResponse("sessionfile.log", request_header, response_header)
-ts.addSSLfile("../tls/ssl/server.pem")
-ts.addSSLfile("../tls/ssl/server.key")
+ts.addDefaultSSLFiles()
ts.Disk.records_config.update(
{
@@ -46,16 +45,17 @@ ts.Disk.ssl_multicert_config.AddLine('dest_ip=* ssl_cert_name=server.pem ssl_key
tr = Test.AddTestRun("tr")
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts)
-tr.MakeCurlCommand('-i http://127.0.0.1:{0}/file'.format(ts.Variables.port))
+tr.MakeCurlCommand('-i http://127.0.0.1:{0}/file'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.Streams.stdout = Testers.ContainsExpression(
"Inactivity Timeout", "Request should fail with inactivity timeout")
-tr2 = Test.AddTestRun("tr")
-tr2.MakeCurlCommand('-k -i --http1.1 https://127.0.0.1:{0}/file'.format(ts.Variables.ssl_port))
-tr2.Processes.Default.Streams.stdout = Testers.ContainsExpression(
- "Inactivity Timeout", "Request should fail with inactivity timeout")
+if not Condition.CurlUsingUnixDomainSocket():
+ tr2 = Test.AddTestRun("tr")
+ tr2.MakeCurlCommand('-k -i --http1.1 https://127.0.0.1:{0}/file'.format(ts.Variables.ssl_port), ts=ts)
+ tr2.Processes.Default.Streams.stdout = Testers.ContainsExpression(
+ "Inactivity Timeout", "Request should fail with inactivity timeout")
-tr3 = Test.AddTestRun("tr")
-tr3.MakeCurlCommand('-k -i --http2 https://127.0.0.1:{0}/file'.format(ts.Variables.ssl_port))
-tr3.Processes.Default.Streams.stdout = Testers.ContainsExpression(
- "Inactivity Timeout", "Request should fail with inactivity timeout")
+ tr3 = Test.AddTestRun("tr")
+ tr3.MakeCurlCommand('-k -i --http2 https://127.0.0.1:{0}/file'.format(ts.Variables.ssl_port), ts=ts)
+ tr3.Processes.Default.Streams.stdout = Testers.ContainsExpression(
+ "Inactivity Timeout", "Request should fail with inactivity timeout")
diff --git a/tests/gold_tests/timeout/slow_server_uds.yaml b/tests/gold_tests/timeout/slow_server_uds.yaml
new file mode 100644
index 0000000000..fe97edf6d4
--- /dev/null
+++ b/tests/gold_tests/timeout/slow_server_uds.yaml
@@ -0,0 +1,83 @@
+# 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.
+
+#
+# This replay file assumes that caching is enabled and
+# proxy.config.http.cache.ignore_client_cc_max_age is set to 0 so that we can
+# test max-age in the client requests.
+#
+
+meta:
+ version: "1.0"
+
+ blocks:
+ - delayed_response: &delayed_response
+ delay: 3s
+
+ status: 200
+ reason: OK
+ headers:
+ fields:
+ - [ Content-Length, 16 ]
+ - [ Connection, close ]
+
+sessions:
+
+#
+# An HTTP GET request.
+#
+- transactions:
+ - client-request:
+ method: "GET"
+ version: "1.1"
+ url: "/path/1"
+ headers:
+ fields:
+ - [ Host, www.no_tls.com ]
+ - [ uuid, 1 ]
+
+ server-response:
+ <<: *delayed_response
+ headers:
+ fields:
+ - [ X-Response, 1 ]
+
+ proxy-response:
+ status: 200
+
+#
+# An HTTP POST request.
+#
+- transactions:
+ - client-request:
+ method: "POST"
+ version: "1.1"
+ url: "/path/2"
+ headers:
+ fields:
+ - [ Host, www.no_tls.com ]
+ - [ Content-Length, 10 ]
+ - [ uuid, 2 ]
+
+ server-response:
+ <<: *delayed_response
+ headers:
+ fields:
+ - [ X-Response, 2 ]
+
+ proxy-response:
+ status: 200
+
diff --git a/tests/gold_tests/timeout/tls_conn_timeout.test.py b/tests/gold_tests/timeout/tls_conn_timeout.test.py
index 7c18e30cd5..4342f768e3 100644
--- a/tests/gold_tests/timeout/tls_conn_timeout.test.py
+++ b/tests/gold_tests/timeout/tls_conn_timeout.test.py
@@ -67,7 +67,8 @@ tr = Test.AddTestRun("tr-blocking-post")
tr.Setup.Copy(os.path.join(Test.Variables.AtsTestToolsDir, "ssl", "server.pem"))
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.Processes.Default.StartBefore(delay_post_connect, ready=When.PortOpen(Test.Variables.block_connect_port))
-tr.MakeCurlCommand('-H"Connection:close" -d "bob" -i http://127.0.0.1:{0}/connect_blocked --tlsv1.2'.format(ts.Variables.port))
+tr.MakeCurlCommand(
+ '-H"Connection:close" -d "bob" -i http://127.0.0.1:{0}/connect_blocked --tlsv1.2'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/1.1 502 Connection timed out", "Connect failed")
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = delay_post_connect
@@ -77,7 +78,7 @@ tr.StillRunningAfter = Test.Processes.ts
# Should not retry the connection
tr = Test.AddTestRun("tr-delayed-post")
tr.Processes.Default.StartBefore(delay_post_ttfb, ready=When.PortOpen(Test.Variables.block_ttfb_port))
-tr.MakeCurlCommand('-H"Connection:close" -d "bob" -i http://127.0.0.1:{0}/ttfb_blocked --tlsv1.2'.format(ts.Variables.port))
+tr.MakeCurlCommand('-H"Connection:close" -d "bob" -i http://127.0.0.1:{0}/ttfb_blocked --tlsv1.2'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.Streams.All = Testers.ContainsExpression("504 Connection Timed Out", "Connect timeout")
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = delay_post_ttfb
@@ -88,7 +89,7 @@ tr.StillRunningAfter = delay_post_ttfb
# Should retry once
tr = Test.AddTestRun("tr-blocking-get")
tr.Processes.Default.StartBefore(delay_get_connect, ready=When.PortOpen(Test.Variables.get_block_connect_port))
-tr.MakeCurlCommand('-H"Connection:close" -i http://127.0.0.1:{0}/get_connect_blocked --tlsv1.2'.format(ts.Variables.port))
+tr.MakeCurlCommand('-H"Connection:close" -i http://127.0.0.1:{0}/get_connect_blocked --tlsv1.2'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/1.1 502 Connection timed out", "Connect failed")
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = delay_get_connect
@@ -97,7 +98,7 @@ tr.StillRunningAfter = delay_get_connect
# Since get is idempotent, It will try to connect again even though the GET request had been sent
tr = Test.AddTestRun("tr-delayed-get")
tr.Processes.Default.StartBefore(delay_get_ttfb, ready=When.PortOpen(Test.Variables.get_block_ttfb_port))
-tr.MakeCurlCommand('-H"Connection:close" -i http://127.0.0.1:{0}/get_ttfb_blocked --tlsv1.2'.format(ts.Variables.port))
+tr.MakeCurlCommand('-H"Connection:close" -i http://127.0.0.1:{0}/get_ttfb_blocked --tlsv1.2'.format(ts.Variables.port), ts=ts)
tr.Processes.Default.Streams.All = Testers.ContainsExpression("504 Connection Timed Out", "Connect timeout")
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = delay_get_ttfb
diff --git a/tests/gold_tests/tls/allow-plain.test.py b/tests/gold_tests/tls/allow-plain.test.py
index 92eca6e27a..d4791383f4 100644
--- a/tests/gold_tests/tls/allow-plain.test.py
+++ b/tests/gold_tests/tls/allow-plain.test.py
@@ -69,7 +69,8 @@ tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.MakeCurlCommand(
'-o /dev/null -k --verbose -H "uuid: get" --ipv4 --http1.1 --resolve www.example.com:{}:127.0.0.1 https://www.example.com:{}/'
- .format(ts.Variables.ssl_port, ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port, ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
@@ -79,7 +80,8 @@ tr.Processes.Default.Streams.all = Testers.ContainsExpression("TLS", "Should neg
tr2 = Test.AddTestRun()
tr2.MakeCurlCommand(
'--verbose --ipv4 --http1.1 -H "uuid: get" --resolve www.example.com:{}:127.0.0.1 http://www.example.com:{}'.format(
- ts.Variables.ssl_port, ts.Variables.ssl_port))
+ ts.Variables.ssl_port, ts.Variables.ssl_port),
+ ts=ts)
tr2.Processes.Default.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
@@ -90,7 +92,8 @@ tr2.Processes.Default.Streams.all = Testers.ExcludesExpression("TLS", "Should no
tr3 = Test.AddTestRun()
tr3.MakeCurlCommand(
'--verbose -d @big_post_body -H "uuid: post" --ipv4 --http1.1 --resolve www.example.com:{}:127.0.0.1 http://www.example.com:{}/post http://www.example.com:{}/post'
- .format(ts.Variables.ssl_port, ts.Variables.ssl_port, ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port, ts.Variables.ssl_port, ts.Variables.ssl_port),
+ ts=ts)
tr3.Processes.Default.ReturnCode = 0
tr3.StillRunningAfter = server
tr3.StillRunningAfter = ts
diff --git a/tests/gold_tests/tls/ssl_key_dialog.test.py b/tests/gold_tests/tls/ssl_key_dialog.test.py
index 68d6fdc278..c1459e576f 100644
--- a/tests/gold_tests/tls/ssl_key_dialog.test.py
+++ b/tests/gold_tests/tls/ssl_key_dialog.test.py
@@ -50,8 +50,8 @@ server.addResponse("sessionlog.json", request_header, response_header)
tr = Test.AddTestRun("use a key with passphrase")
tr.Setup.Copy("ssl/signer.pem")
tr.MakeCurlCommand(
- f"-v --cacert ./signer.pem --resolve 'passphrase:{ts.Variables.ssl_port}:127.0.0.1' https://passphrase:{ts.Variables.ssl_port}/"
-)
+ f"-v --cacert ./signer.pem --resolve 'passphrase:{ts.Variables.ssl_port}:127.0.0.1' https://passphrase:{ts.Variables.ssl_port}/",
+ ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -86,8 +86,8 @@ tr2reload.Processes.Default.ReturnCode = 0
tr3 = Test.AddTestRun("use a key with passphrase")
tr3.Setup.Copy("ssl/signer.pem")
tr3.MakeCurlCommand(
- f"-v --cacert ./signer.pem --resolve 'passphrase:{ts.Variables.ssl_port}:127.0.0.1' https://passphrase:{ts.Variables.ssl_port}/"
-)
+ f"-v --cacert ./signer.pem --resolve 'passphrase:{ts.Variables.ssl_port}:127.0.0.1' https://passphrase:{ts.Variables.ssl_port}/",
+ ts=ts)
tr3.ReturnCode = 0
tr3.Processes.Default.Streams.stderr.Content = Testers.ContainsExpression("200", "expected 200 OK response")
tr3.Processes.Default.Streams.stdout.Content = Testers.ContainsExpression("success!", "expected success")
diff --git a/tests/gold_tests/tls/ssl_multicert_loader.test.py b/tests/gold_tests/tls/ssl_multicert_loader.test.py
index 7fbfdc4069..60834b1dbc 100644
--- a/tests/gold_tests/tls/ssl_multicert_loader.test.py
+++ b/tests/gold_tests/tls/ssl_multicert_loader.test.py
@@ -47,7 +47,7 @@ tr.Processes.Default.StartBefore(server)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
- f"-q -s -v -k --resolve '{sni_domain}:{ts.Variables.ssl_port}:127.0.0.1' https://{sni_domain}:{ts.Variables.ssl_port}")
+ f"-q -s -v -k --resolve '{sni_domain}:{ts.Variables.ssl_port}:127.0.0.1' https://{sni_domain}:{ts.Variables.ssl_port}", ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
tr.Processes.Default.Streams.stderr = Testers.IncludesExpression(f"CN={sni_domain}", "Check response")
@@ -84,7 +84,7 @@ tr3.Processes.Default.StartBefore(server2, ready=When.FileContains(ts.Disk.diags
tr3.StillRunningAfter = ts
tr3.StillRunningAfter = server
tr3.MakeCurlCommand(
- f"-q -s -v -k --resolve '{sni_domain}:{ts.Variables.ssl_port}:127.0.0.1' https://{sni_domain}:{ts.Variables.ssl_port}")
+ f"-q -s -v -k --resolve '{sni_domain}:{ts.Variables.ssl_port}:127.0.0.1' https://{sni_domain}:{ts.Variables.ssl_port}", ts=ts)
tr3.Processes.Default.ReturnCode = 0
tr3.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
tr3.Processes.Default.Streams.stderr = Testers.IncludesExpression(f"CN={sni_domain}", "Check response")
diff --git a/tests/gold_tests/tls/tls_0rtt_server.test.py b/tests/gold_tests/tls/tls_0rtt_server.test.py
index 5fdbffff04..081644a918 100644
--- a/tests/gold_tests/tls/tls_0rtt_server.test.py
+++ b/tests/gold_tests/tls/tls_0rtt_server.test.py
@@ -155,7 +155,7 @@ ts2.Disk.sni_yaml.AddLines([
])
tr = Test.AddTestRun('Basic Curl Test')
-tr.MakeCurlCommand('-k --resolve example.com:{0}:127.0.0.1 https://example.com:{0}'.format(ts1.Variables.ssl_port))
+tr.MakeCurlCommand('-k --resolve example.com:{0}:127.0.0.1 https://example.com:{0}'.format(ts1.Variables.ssl_port), ts=ts1)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts1)
diff --git a/tests/gold_tests/tls/tls_bad_alpn.test.py b/tests/gold_tests/tls/tls_bad_alpn.test.py
index 9478a96c9a..027eed148d 100644
--- a/tests/gold_tests/tls/tls_bad_alpn.test.py
+++ b/tests/gold_tests/tls/tls_bad_alpn.test.py
@@ -68,7 +68,7 @@ tr.Processes.Default.Streams.All += Testers.IncludesExpression("No ALPN negotiat
tr.Processes.Default.Streams.All += Testers.IncludesExpression("HTTP/1.1 400 Host Header Required", "Processed the request")
tr = Test.AddTestRun("alpn h2")
-tr.MakeCurlCommand("-k --http2 -v -o /dev/null https://127.0.0.1:{}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-k --http2 -v -o /dev/null https://127.0.0.1:{}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
tr.Processes.Default.Streams.All += Testers.IncludesExpression("ALPN. server accepted.*h2", "negotiated h2")
diff --git a/tests/gold_tests/tls/tls_check_cert_select_plugin.test.py b/tests/gold_tests/tls/tls_check_cert_select_plugin.test.py
index 928928ea52..b4b4d8f587 100644
--- a/tests/gold_tests/tls/tls_check_cert_select_plugin.test.py
+++ b/tests/gold_tests/tls/tls_check_cert_select_plugin.test.py
@@ -77,7 +77,8 @@ dns.addRecords(records={"bar.com.": ["127.0.0.1"]})
tr = Test.AddTestRun("bar.com cert")
tr.Setup.Copy("ssl/signer.pem")
tr.Setup.Copy("ssl/signer2.pem")
-tr.MakeCurlCommand("-v --cacert ./signer2.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ "-v --cacert ./signer2.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(dns)
@@ -91,7 +92,8 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("404", "Should ma
# Should receive a foo.com cert
tr2 = Test.AddTestRun("foo.com cert")
-tr2.MakeCurlCommand("-v --cacert ./signer.pem --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand(
+ "-v --cacert ./signer.pem --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
@@ -102,7 +104,8 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("404", "Should ma
# Should receive random.server.com
tr2 = Test.AddTestRun("random.server.com cert")
-tr2.MakeCurlCommand("-v -k --resolve 'random.server.com:{0}:127.0.0.1' https://random.server.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand(
+ "-v -k --resolve 'random.server.com:{0}:127.0.0.1' https://random.server.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
@@ -116,7 +119,8 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("404", "Should ma
# SNI name and returned cert name will not match, so must use -k to avoid cert verification
tr2 = Test.AddTestRun("Bad SNI")
tr2.MakeCurlCommand(
- "-v -k --cacert ./signer.pem --resolve 'bad.sni.com:{0}:127.0.0.1' https://bad.sni.com:{0}".format(ts.Variables.ssl_port))
+ "-v -k --cacert ./signer.pem --resolve 'bad.sni.com:{0}:127.0.0.1' https://bad.sni.com:{0}".format(ts.Variables.ssl_port),
+ ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
@@ -144,7 +148,8 @@ trupdate.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun("Test new version of bar cert with good CA")
tr.DelayStart = 4
tr.MakeCurlCommandMulti(
- "date; {{curl}} -v --cacert ./signer.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port))
+ "date; {{curl}} -v --cacert ./signer.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
@@ -154,7 +159,8 @@ tr.Processes.Default.Streams.All += Testers.ExcludesExpression("CN=foo.com", "Ce
tr.Processes.Default.Streams.All += Testers.ContainsExpression("404", "Should make an exchange")
tr = Test.AddTestRun("Test new version of bar cert with bad CA")
-tr.MakeCurlCommand("-v --cacert ./signer2.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ "-v --cacert ./signer2.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 60
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/tls/tls_check_cert_selection.test.py b/tests/gold_tests/tls/tls_check_cert_selection.test.py
index 4ed5887b50..d5c18867f0 100644
--- a/tests/gold_tests/tls/tls_check_cert_selection.test.py
+++ b/tests/gold_tests/tls/tls_check_cert_selection.test.py
@@ -68,7 +68,8 @@ dns.addRecords(records={"bar.com.": ["127.0.0.1"]})
tr = Test.AddTestRun("bar.com cert")
tr.Setup.Copy("ssl/signer.pem")
tr.Setup.Copy("ssl/signer2.pem")
-tr.MakeCurlCommand("-v --cacert ./signer2.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ "-v --cacert ./signer2.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(dns)
@@ -82,7 +83,8 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("404", "Should ma
# Should receive a foo.com cert
tr2 = Test.AddTestRun("foo.com cert")
-tr2.MakeCurlCommand("-v --cacert ./signer.pem --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand(
+ "-v --cacert ./signer.pem --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
@@ -93,7 +95,8 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("404", "Should ma
# Should receive random.server.com
tr2 = Test.AddTestRun("random.server.com cert")
-tr2.MakeCurlCommand("-v -k --resolve 'random.server.com:{0}:127.0.0.1' https://random.server.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand(
+ "-v -k --resolve 'random.server.com:{0}:127.0.0.1' https://random.server.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
@@ -107,7 +110,8 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("404", "Should ma
# SNI name and returned cert name will not match, so must use -k to avoid cert verification
tr2 = Test.AddTestRun("Bad SNI")
tr2.MakeCurlCommand(
- "-v -k --cacert ./signer.pem --resolve 'bad.sni.com:{0}:127.0.0.1' https://bad.sni.com:{0}".format(ts.Variables.ssl_port))
+ "-v -k --cacert ./signer.pem --resolve 'bad.sni.com:{0}:127.0.0.1' https://bad.sni.com:{0}".format(ts.Variables.ssl_port),
+ ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
diff --git a/tests/gold_tests/tls/tls_check_cert_selection_reload.test.py b/tests/gold_tests/tls/tls_check_cert_selection_reload.test.py
index cc190d6dd1..51d092a844 100644
--- a/tests/gold_tests/tls/tls_check_cert_selection_reload.test.py
+++ b/tests/gold_tests/tls/tls_check_cert_selection_reload.test.py
@@ -63,7 +63,7 @@ tr = Test.AddTestRun("bar.com cert signer1")
tr.Setup.Copy("ssl/signer.pem")
tr.Setup.Copy("ssl/signer2.pem")
tr.MakeCurlCommand(
- "-v --cacert ./signer.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/random".format(ts.Variables.ssl_port))
+ "-v --cacert ./signer.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/random".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
@@ -76,7 +76,7 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("404", "Should ma
tr = Test.AddTestRun("bar.com cert signer2")
tr.MakeCurlCommand(
- "-v --cacert ./signer2.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/random".format(ts.Variables.ssl_port))
+ "-v --cacert ./signer2.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/random".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 60
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
@@ -111,14 +111,14 @@ tr.Processes.Default.StartBefore(
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
- "-v --cacert ./signer.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/random".format(ts.Variables.ssl_port))
+ "-v --cacert ./signer.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/random".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 60
tr.Processes.Default.Streams.All = Testers.ContainsExpression(
"unable to get local issuer certificate", "Server certificate not issued by expected signer")
tr = Test.AddTestRun("Try with signer 2 again")
tr.MakeCurlCommand(
- "-v --cacert ./signer2.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/random".format(ts.Variables.ssl_port))
+ "-v --cacert ./signer2.pem --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/random".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/tls/tls_client_cert.test.py b/tests/gold_tests/tls/tls_client_cert.test.py
index 836cedd63f..c848c735fa 100644
--- a/tests/gold_tests/tls/tls_client_cert.test.py
+++ b/tests/gold_tests/tls/tls_client_cert.test.py
@@ -121,7 +121,7 @@ tr.Processes.Default.StartBefore(server2)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
-tr.MakeCurlCommand("-H host:example.com http://127.0.0.1:{0}/case1".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:example.com http://127.0.0.1:{0}/case1".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -130,7 +130,7 @@ trfail = Test.AddTestRun("Connect with first client cert to second server")
trfail.StillRunningAfter = ts
trfail.StillRunningAfter = server
trfail.StillRunningAfter = server2
-trfail.MakeCurlCommand('-H host:example.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+trfail.MakeCurlCommand('-H host:example.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
trfail.Processes.Default.ReturnCode = 0
trfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -139,7 +139,7 @@ trbar = Test.AddTestRun("Connect with signed2 bar to second server")
trbar.StillRunningAfter = ts
trbar.StillRunningAfter = server
trbar.StillRunningAfter = server2
-trbar.MakeCurlCommand("-H host:bar.com http://127.0.0.1:{0}/case2".format(ts.Variables.port))
+trbar.MakeCurlCommand("-H host:bar.com http://127.0.0.1:{0}/case2".format(ts.Variables.port), ts=ts)
trbar.Processes.Default.ReturnCode = 0
trbar.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -148,7 +148,7 @@ trbarfail = Test.AddTestRun("Connect with signed2 bar cert to first server")
trbarfail.StillRunningAfter = ts
trbarfail.StillRunningAfter = server
trbarfail.StillRunningAfter = server2
-trbarfail.MakeCurlCommand('-H host:bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+trbarfail.MakeCurlCommand('-H host:bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
trbarfail.Processes.Default.ReturnCode = 0
trbarfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -198,7 +198,7 @@ tr3bar.Processes.Default.StartBefore(server3, ready=When.FileContains(ts.Disk.di
tr3bar.StillRunningAfter = ts
tr3bar.StillRunningAfter = server
tr3bar.StillRunningAfter = server2
-tr3bar.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+tr3bar.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
tr3bar.Processes.Default.ReturnCode = 0
tr3bar.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -207,7 +207,7 @@ tr3barfail = Test.AddTestRun("Make request with other bar cert to second server"
tr3barfail.StillRunningAfter = ts
tr3barfail.StillRunningAfter = server
tr3barfail.StillRunningAfter = server2
-tr3barfail.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+tr3barfail.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
tr3barfail.Processes.Default.ReturnCode = 0
tr3barfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -217,7 +217,7 @@ tr3 = Test.AddTestRun("Make request with other cert to second server")
tr3.StillRunningAfter = ts
tr3.StillRunningAfter = server
tr3.StillRunningAfter = server2
-tr3.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+tr3.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
tr3.Processes.Default.ReturnCode = 0
tr3.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -226,7 +226,7 @@ tr3fail = Test.AddTestRun("Make request with other cert to first server")
tr3fail.StillRunningAfter = ts
tr3fail.StillRunningAfter = server
tr3fail.StillRunningAfter = server2
-tr3fail.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+tr3fail.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
tr3fail.Processes.Default.ReturnCode = 0
tr3fail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -260,7 +260,7 @@ tr4bar.DelayStart = 10
tr4bar.StillRunningAfter = ts
tr4bar.StillRunningAfter = server
tr4bar.StillRunningAfter = server2
-tr4bar.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+tr4bar.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
tr4bar.Processes.Default.ReturnCode = 0
tr4bar.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -269,7 +269,7 @@ tr4barfail = Test.AddTestRun("Make request with renamed bar cert to first server
tr4barfail.StillRunningAfter = ts
tr4barfail.StillRunningAfter = server
tr4barfail.StillRunningAfter = server2
-tr4barfail.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+tr4barfail.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
tr4barfail.Processes.Default.ReturnCode = 0
tr4barfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -278,7 +278,7 @@ tr4 = Test.AddTestRun("Make request with renamed foo cert to first server")
tr4.StillRunningAfter = ts
tr4.StillRunningAfter = server
tr4.StillRunningAfter = server2
-tr4.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+tr4.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
tr4.Processes.Default.ReturnCode = 0
tr4.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -287,7 +287,7 @@ tr4fail = Test.AddTestRun("Make request with renamed foo cert to second server")
tr4fail.StillRunningAfter = ts
tr4fail.StillRunningAfter = server
tr4fail.StillRunningAfter = server2
-tr4fail.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+tr4fail.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
tr4fail.Processes.Default.ReturnCode = 0
tr4fail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
diff --git a/tests/gold_tests/tls/tls_client_cert2.test.py b/tests/gold_tests/tls/tls_client_cert2.test.py
index 0205aedbb7..1e6970e746 100644
--- a/tests/gold_tests/tls/tls_client_cert2.test.py
+++ b/tests/gold_tests/tls/tls_client_cert2.test.py
@@ -127,7 +127,7 @@ tr.Processes.Default.StartBefore(server2)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
-tr.MakeCurlCommand("-H host:bob.bar.com http://127.0.0.1:{0}/case1".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:bob.bar.com http://127.0.0.1:{0}/case1".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -136,7 +136,7 @@ trfail = Test.AddTestRun("bob.bar.com to server 2")
trfail.StillRunningAfter = ts
trfail.StillRunningAfter = server
trfail.StillRunningAfter = server2
-trfail.MakeCurlCommand('-H host:bob.bar.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+trfail.MakeCurlCommand('-H host:bob.bar.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
trfail.Processes.Default.ReturnCode = 0
trfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -145,7 +145,7 @@ tr = Test.AddTestRun("bob.foo.com to server 1")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
-tr.MakeCurlCommand("-H host:bob.foo.com http://127.0.0.1:{0}/case1".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:bob.foo.com http://127.0.0.1:{0}/case1".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -154,7 +154,7 @@ trfail = Test.AddTestRun("bob.foo.com to server 2")
trfail.StillRunningAfter = ts
trfail.StillRunningAfter = server
trfail.StillRunningAfter = server2
-trfail.MakeCurlCommand('-H host:bob.foo.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+trfail.MakeCurlCommand('-H host:bob.foo.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
trfail.Processes.Default.ReturnCode = 0
trfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -163,7 +163,7 @@ tr = Test.AddTestRun("random.bar.com to server 2")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
-tr.MakeCurlCommand("-H host:random.bar.com http://127.0.0.1:{0}/case2".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:random.bar.com http://127.0.0.1:{0}/case2".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -172,7 +172,7 @@ trfail = Test.AddTestRun("random.bar.com to server 1")
trfail.StillRunningAfter = ts
trfail.StillRunningAfter = server
trfail.StillRunningAfter = server2
-trfail.MakeCurlCommand('-H host:random.bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+trfail.MakeCurlCommand('-H host:random.bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
trfail.Processes.Default.ReturnCode = 0
trfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -181,7 +181,7 @@ tr = Test.AddTestRun("random.foo.com to server 2")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
-tr.MakeCurlCommand("-H host:random.foo.com http://127.0.0.1:{0}/case2".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:random.foo.com http://127.0.0.1:{0}/case2".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -190,7 +190,7 @@ trfail = Test.AddTestRun("random.foo.com to server 1")
trfail.StillRunningAfter = ts
trfail.StillRunningAfter = server
trfail.StillRunningAfter = server2
-trfail.MakeCurlCommand('-H host:random.foo.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+trfail.MakeCurlCommand('-H host:random.foo.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
trfail.Processes.Default.ReturnCode = 0
trfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
diff --git a/tests/gold_tests/tls/tls_client_cert2_plugin.test.py b/tests/gold_tests/tls/tls_client_cert2_plugin.test.py
index ddf9b693c0..3f7924d777 100644
--- a/tests/gold_tests/tls/tls_client_cert2_plugin.test.py
+++ b/tests/gold_tests/tls/tls_client_cert2_plugin.test.py
@@ -124,7 +124,7 @@ tr.Processes.Default.StartBefore(server2)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
-tr.MakeCurlCommand("-H host:bob.bar.com http://127.0.0.1:{0}/case1".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:bob.bar.com http://127.0.0.1:{0}/case1".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -133,7 +133,7 @@ trfail = Test.AddTestRun("bob.bar.com to server 2")
trfail.StillRunningAfter = ts
trfail.StillRunningAfter = server
trfail.StillRunningAfter = server2
-trfail.MakeCurlCommand('-H host:bob.bar.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+trfail.MakeCurlCommand('-H host:bob.bar.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
trfail.Processes.Default.ReturnCode = 0
trfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -142,7 +142,7 @@ tr = Test.AddTestRun("bob.foo.com to server 1")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
-tr.MakeCurlCommand("-H host:bob.foo.com http://127.0.0.1:{0}/case1".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:bob.foo.com http://127.0.0.1:{0}/case1".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -151,7 +151,7 @@ trfail = Test.AddTestRun("bob.foo.com to server 2")
trfail.StillRunningAfter = ts
trfail.StillRunningAfter = server
trfail.StillRunningAfter = server2
-trfail.MakeCurlCommand('-H host:bob.foo.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+trfail.MakeCurlCommand('-H host:bob.foo.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
trfail.Processes.Default.ReturnCode = 0
trfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -160,7 +160,7 @@ tr = Test.AddTestRun("random.bar.com to server 2")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
-tr.MakeCurlCommand("-H host:random.bar.com http://127.0.0.1:{0}/case2".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:random.bar.com http://127.0.0.1:{0}/case2".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -169,7 +169,7 @@ trfail = Test.AddTestRun("random.bar.com to server 1")
trfail.StillRunningAfter = ts
trfail.StillRunningAfter = server
trfail.StillRunningAfter = server2
-trfail.MakeCurlCommand('-H host:random.bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+trfail.MakeCurlCommand('-H host:random.bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
trfail.Processes.Default.ReturnCode = 0
trfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -178,7 +178,7 @@ tr = Test.AddTestRun("random.foo.com to server 2")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
-tr.MakeCurlCommand("-H host:random.foo.com http://127.0.0.1:{0}/case2".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:random.foo.com http://127.0.0.1:{0}/case2".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -187,6 +187,6 @@ trfail = Test.AddTestRun("random.foo.com to server 1")
trfail.StillRunningAfter = ts
trfail.StillRunningAfter = server
trfail.StillRunningAfter = server2
-trfail.MakeCurlCommand('-H host:random.foo.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+trfail.MakeCurlCommand('-H host:random.foo.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
trfail.Processes.Default.ReturnCode = 0
trfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
diff --git a/tests/gold_tests/tls/tls_client_cert_override.test.py b/tests/gold_tests/tls/tls_client_cert_override.test.py
index aa1e8ef623..38f951d570 100644
--- a/tests/gold_tests/tls/tls_client_cert_override.test.py
+++ b/tests/gold_tests/tls/tls_client_cert_override.test.py
@@ -111,7 +111,7 @@ tr.Processes.Default.StartBefore(server2)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
-tr.MakeCurlCommand("-H host:example.com http://127.0.0.1:{0}/case1".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:example.com http://127.0.0.1:{0}/case1".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -120,7 +120,7 @@ trfail = Test.AddTestRun("Connect with bad client cert to first server")
trfail.StillRunningAfter = ts
trfail.StillRunningAfter = server
trfail.StillRunningAfter = server2
-trfail.MakeCurlCommand('-H host:example.com http://127.0.0.1:{0}/badcase1'.format(ts.Variables.port))
+trfail.MakeCurlCommand('-H host:example.com http://127.0.0.1:{0}/badcase1'.format(ts.Variables.port), ts=ts)
trfail.Processes.Default.ReturnCode = 0
trfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -129,7 +129,7 @@ trbar = Test.AddTestRun("Connect with correct client cert to second server")
trbar.StillRunningAfter = ts
trbar.StillRunningAfter = server
trbar.StillRunningAfter = server2
-trbar.MakeCurlCommand("-H host:bar.com http://127.0.0.1:{0}/case2".format(ts.Variables.port))
+trbar.MakeCurlCommand("-H host:bar.com http://127.0.0.1:{0}/case2".format(ts.Variables.port), ts=ts)
trbar.Processes.Default.ReturnCode = 0
trbar.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -138,6 +138,6 @@ trbarfail = Test.AddTestRun("Connect with bad client cert to second server")
trbarfail.StillRunningAfter = ts
trbarfail.StillRunningAfter = server
trbarfail.StillRunningAfter = server2
-trbarfail.MakeCurlCommand('-H host:bar.com http://127.0.0.1:{0}/badcase2'.format(ts.Variables.port))
+trbarfail.MakeCurlCommand('-H host:bar.com http://127.0.0.1:{0}/badcase2'.format(ts.Variables.port), ts=ts)
trbarfail.Processes.Default.ReturnCode = 0
trbarfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
diff --git a/tests/gold_tests/tls/tls_client_cert_override_plugin.test.py b/tests/gold_tests/tls/tls_client_cert_override_plugin.test.py
index 572fb29beb..c9af9e2cca 100644
--- a/tests/gold_tests/tls/tls_client_cert_override_plugin.test.py
+++ b/tests/gold_tests/tls/tls_client_cert_override_plugin.test.py
@@ -130,7 +130,7 @@ tr.Processes.Default.StartBefore(server2)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
-tr.MakeCurlCommand("-H host:example.com http://127.0.0.1:{0}/case1".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:example.com http://127.0.0.1:{0}/case1".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -139,7 +139,7 @@ trfail = Test.AddTestRun("Connect with bad client cert to first server")
trfail.StillRunningAfter = ts
trfail.StillRunningAfter = server
trfail.StillRunningAfter = server2
-trfail.MakeCurlCommand('-H host:example.com http://127.0.0.1:{0}/badcase1'.format(ts.Variables.port))
+trfail.MakeCurlCommand('-H host:example.com http://127.0.0.1:{0}/badcase1'.format(ts.Variables.port), ts=ts)
trfail.Processes.Default.ReturnCode = 0
trfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -148,7 +148,7 @@ trbar = Test.AddTestRun("Connect with correct client cert to second server")
trbar.StillRunningAfter = ts
trbar.StillRunningAfter = server
trbar.StillRunningAfter = server2
-trbar.MakeCurlCommand("-H host:bar.com http://127.0.0.1:{0}/case2".format(ts.Variables.port))
+trbar.MakeCurlCommand("-H host:bar.com http://127.0.0.1:{0}/case2".format(ts.Variables.port), ts=ts)
trbar.Processes.Default.ReturnCode = 0
trbar.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -157,7 +157,7 @@ trbarfail = Test.AddTestRun("Connect with bad client cert to second server")
trbarfail.StillRunningAfter = ts
trbarfail.StillRunningAfter = server
trbarfail.StillRunningAfter = server2
-trbarfail.MakeCurlCommand('-H host:bar.com http://127.0.0.1:{0}/badcase2'.format(ts.Variables.port))
+trbarfail.MakeCurlCommand('-H host:bar.com http://127.0.0.1:{0}/badcase2'.format(ts.Variables.port), ts=ts)
trbarfail.Processes.Default.ReturnCode = 0
trbarfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -189,7 +189,7 @@ tr3bar.Processes.Default.StartBefore(server3, ready=When.FileContains(ts.Disk.di
tr3bar.StillRunningAfter = ts
tr3bar.StillRunningAfter = server
tr3bar.StillRunningAfter = server2
-tr3bar.MakeCurlCommand(' -H host:foo.com http://127.0.0.1:{0}/badcase1'.format(ts.Variables.port))
+tr3bar.MakeCurlCommand(' -H host:foo.com http://127.0.0.1:{0}/badcase1'.format(ts.Variables.port), ts=ts)
tr3bar.Processes.Default.ReturnCode = 0
tr3bar.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -213,7 +213,7 @@ tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
tr.StillRunningAfter = ts
-tr.MakeCurlCommand("-H host:example.com http://127.0.0.1:{0}/case1".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:example.com http://127.0.0.1:{0}/case1".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -222,6 +222,6 @@ tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
tr.StillRunningAfter = ts
-tr.MakeCurlCommand("-H host:example.com http://127.0.0.1:{0}/badcase1".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:example.com http://127.0.0.1:{0}/badcase1".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
diff --git a/tests/gold_tests/tls/tls_client_cert_plugin.test.py b/tests/gold_tests/tls/tls_client_cert_plugin.test.py
index 8bc7944d84..7b8d39d91e 100644
--- a/tests/gold_tests/tls/tls_client_cert_plugin.test.py
+++ b/tests/gold_tests/tls/tls_client_cert_plugin.test.py
@@ -116,7 +116,7 @@ tr.Processes.Default.StartBefore(server2)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.StillRunningAfter = server2
-tr.MakeCurlCommand("-H host:example.com http://127.0.0.1:{0}/case1".format(ts.Variables.port))
+tr.MakeCurlCommand("-H host:example.com http://127.0.0.1:{0}/case1".format(ts.Variables.port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -125,7 +125,7 @@ trfail = Test.AddTestRun("Connect with first client cert to second server")
trfail.StillRunningAfter = ts
trfail.StillRunningAfter = server
trfail.StillRunningAfter = server2
-trfail.MakeCurlCommand('-H host:example.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+trfail.MakeCurlCommand('-H host:example.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
trfail.Processes.Default.ReturnCode = 0
trfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -134,7 +134,7 @@ trbar = Test.AddTestRun("Connect with signed2 bar to second server")
trbar.StillRunningAfter = ts
trbar.StillRunningAfter = server
trbar.StillRunningAfter = server2
-trbar.MakeCurlCommand("-H host:bar.com http://127.0.0.1:{0}/case2".format(ts.Variables.port))
+trbar.MakeCurlCommand("-H host:bar.com http://127.0.0.1:{0}/case2".format(ts.Variables.port), ts=ts)
trbar.Processes.Default.ReturnCode = 0
trbar.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -143,7 +143,7 @@ trbarfail = Test.AddTestRun("Connect with signed2 bar cert to first server")
trbarfail.StillRunningAfter = ts
trbarfail.StillRunningAfter = server
trbarfail.StillRunningAfter = server2
-trbarfail.MakeCurlCommand('-H host:bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+trbarfail.MakeCurlCommand('-H host:bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
trbarfail.Processes.Default.ReturnCode = 0
trbarfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -195,7 +195,7 @@ tr3bar.Processes.Default.StartBefore(server3, ready=When.FileContains(ts.Disk.di
tr3bar.StillRunningAfter = ts
tr3bar.StillRunningAfter = server
tr3bar.StillRunningAfter = server2
-tr3bar.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+tr3bar.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
tr3bar.Processes.Default.ReturnCode = 0
tr3bar.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -204,7 +204,7 @@ tr3barfail = Test.AddTestRun("Make request with other bar cert to second server"
tr3barfail.StillRunningAfter = ts
tr3barfail.StillRunningAfter = server
tr3barfail.StillRunningAfter = server2
-tr3barfail.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+tr3barfail.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
tr3barfail.Processes.Default.ReturnCode = 0
tr3barfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -214,7 +214,7 @@ tr3 = Test.AddTestRun("Make request with other cert to second server")
tr3.StillRunningAfter = ts
tr3.StillRunningAfter = server
tr3.StillRunningAfter = server2
-tr3.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+tr3.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
tr3.Processes.Default.ReturnCode = 0
tr3.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -223,7 +223,7 @@ tr3fail = Test.AddTestRun("Make request with other cert to first server")
tr3fail.StillRunningAfter = ts
tr3fail.StillRunningAfter = server
tr3fail.StillRunningAfter = server2
-tr3fail.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+tr3fail.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
tr3fail.Processes.Default.ReturnCode = 0
tr3fail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -257,7 +257,7 @@ tr4bar.DelayStart = 10
tr4bar.StillRunningAfter = ts
tr4bar.StillRunningAfter = server
tr4bar.StillRunningAfter = server2
-tr4bar.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+tr4bar.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
tr4bar.Processes.Default.ReturnCode = 0
tr4bar.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -266,7 +266,7 @@ tr4barfail = Test.AddTestRun("Make request with renamed bar cert to first server
tr4barfail.StillRunningAfter = ts
tr4barfail.StillRunningAfter = server
tr4barfail.StillRunningAfter = server2
-tr4barfail.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+tr4barfail.MakeCurlCommand(' -H host:bar.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
tr4barfail.Processes.Default.ReturnCode = 0
tr4barfail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
@@ -275,7 +275,7 @@ tr4 = Test.AddTestRun("Make request with renamed foo cert to first server")
tr4.StillRunningAfter = ts
tr4.StillRunningAfter = server
tr4.StillRunningAfter = server2
-tr4.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+tr4.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
tr4.Processes.Default.ReturnCode = 0
tr4.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Check response")
@@ -284,6 +284,6 @@ tr4fail = Test.AddTestRun("Make request with renamed foo cert to second server")
tr4fail.StillRunningAfter = ts
tr4fail.StillRunningAfter = server
tr4fail.StillRunningAfter = server2
-tr4fail.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port))
+tr4fail.MakeCurlCommand(' -H host:example.com http://127.0.0.1:{0}/case2'.format(ts.Variables.port), ts=ts)
tr4fail.Processes.Default.ReturnCode = 0
tr4fail.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Check response")
diff --git a/tests/gold_tests/tls/tls_client_verify.test.py b/tests/gold_tests/tls/tls_client_verify.test.py
index 1c9f175b49..917e48842a 100644
--- a/tests/gold_tests/tls/tls_client_verify.test.py
+++ b/tests/gold_tests/tls/tls_client_verify.test.py
@@ -86,7 +86,8 @@ tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.Processes.Default.StartBefore(server)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand("--tls-max 1.2 -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}/case1".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ "--tls-max 1.2 -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}/case1".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun("Connect to foo.com with bad cert")
@@ -96,7 +97,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./server.pem --key ./server.key --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}/case2".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
# Should fail with badly signed certs
tr.Processes.Default.ReturnCode = 35
@@ -107,7 +109,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./signed-foo.pem --key ./signed-foo.key --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}/case3"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check response")
@@ -115,7 +118,7 @@ tr = Test.AddTestRun("Connect to bob.bar.com without cert")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
- "--tls-max 1.2 -k --resolve 'bob.bar.com:{0}:127.0.0.1' https://bob.bar.com:{0}/case4".format(ts.Variables.ssl_port))
+ "--tls-max 1.2 -k --resolve 'bob.bar.com:{0}:127.0.0.1' https://bob.bar.com:{0}/case4".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("alert", "TLS handshake should succeed")
@@ -126,7 +129,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./signed-bob-bar.pem --key ./signed-bar.key --resolve 'bob.bar.com:{0}:127.0.0.1' https://bob.bar.com:{0}/case5"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check response")
@@ -137,7 +141,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./server.pem --key ./server.key --resolve 'bob.bar.com:{0}:127.0.0.1' https://bob.bar.com:{0}/case6"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check response")
@@ -145,7 +150,7 @@ tr = Test.AddTestRun("Connect to bob.foo.com without cert")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
- "--tls-max 1.2 -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}/case7".format(ts.Variables.ssl_port))
+ "--tls-max 1.2 -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}/case7".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("alert", "TLS handshake should succeed")
@@ -156,7 +161,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./signed-bob-foo.pem --key ./signed-foo.key --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}/case8"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check response")
@@ -167,14 +173,16 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./server.pem --key ./server.key --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}/case9"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check response")
tr = Test.AddTestRun("Connect to bar.com without cert")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand("--tls-max 1.2 -k --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/case10".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ "--tls-max 1.2 -k --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/case10".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun("Connect to bar.com with cert")
@@ -184,7 +192,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./signed-bar.pem --key ./signed-bar.key --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/case11"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "TLS handshake should succeed")
@@ -195,21 +204,23 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./server.pem --key ./server.key --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/case12".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 35
# Test that the fqdn's match completely. bob.com should require client certificate. bob.com.com should not
tr = Test.AddTestRun("Connect to bob.com without cert, should fail")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand("--tls-max 1.2 -k --resolve 'bob.com:{0}:127.0.0.1' https://bob.com:{0}/case13".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ "--tls-max 1.2 -k --resolve 'bob.com:{0}:127.0.0.1' https://bob.com:{0}/case13".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun("Connect to bob.foo.com without cert, should succeed")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
- "--tls-max 1.2 -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}/case14".format(ts.Variables.ssl_port))
+ "--tls-max 1.2 -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}/case14".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun("Wait for the access log to write out")
diff --git a/tests/gold_tests/tls/tls_client_verify2.test.py b/tests/gold_tests/tls/tls_client_verify2.test.py
index a868afc380..657d8ebe05 100644
--- a/tests/gold_tests/tls/tls_client_verify2.test.py
+++ b/tests/gold_tests/tls/tls_client_verify2.test.py
@@ -71,7 +71,8 @@ tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.Processes.Default.StartBefore(server)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand("--tls-max 1.2 -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}/case1".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ "--tls-max 1.2 -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}/case1".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check response")
@@ -82,7 +83,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./signed-foo.pem --key ./signed-foo.key --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}/case1"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check response")
@@ -90,7 +92,7 @@ tr = Test.AddTestRun("Connect to bob.bar.com without cert")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
- "--tls-max 1.2 -k --resolve 'bob.bar.com:{0}:127.0.0.1' https://bob.bar.com:{0}/case1".format(ts.Variables.ssl_port))
+ "--tls-max 1.2 -k --resolve 'bob.bar.com:{0}:127.0.0.1' https://bob.bar.com:{0}/case1".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun("Connect to bob.bar.com with cert")
@@ -100,7 +102,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./signed-bob-bar.pem --key ./signed-bar.key --resolve 'bob.bar.com:{0}:127.0.0.1' https://bob.bar.com:{0}/case1"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "TLS handshake should succeed")
@@ -111,14 +114,15 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./server.pem --key ./server.key --resolve 'bob.bar.com:{0}:127.0.0.1' https://bob.bar.com:{0}/case1"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun("Connect to bob.foo.com without cert")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
- "--tls-max 1.2 -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}/case1".format(ts.Variables.ssl_port))
+ "--tls-max 1.2 -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}/case1".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun("Connect to bob.foo.com with cert")
@@ -128,7 +132,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./signed-bob-foo.pem --key ./signed-foo.key --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}/case1"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "TLS handshake should succeed")
@@ -139,13 +144,15 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./server.pem --key ./server.key --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}/case1"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun("Connect to bar.com without cert")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand("--tls-max 1.2 -k --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/case1".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ "--tls-max 1.2 -k --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/case1".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("alert", "TLS handshake should succeed")
@@ -156,7 +163,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./signed-bar.pem --key ./signed-bar.key --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/case1"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check response")
@@ -167,6 +175,7 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./server.pem --key ./server.key --resolve 'bar.com:{0}:127.0.0.1' https://bar.com:{0}/case1".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("alert unknown ca", "TLS handshake should succeed")
diff --git a/tests/gold_tests/tls/tls_client_verify3.test.py b/tests/gold_tests/tls/tls_client_verify3.test.py
index e0ef8b2815..27fd741b8f 100644
--- a/tests/gold_tests/tls/tls_client_verify3.test.py
+++ b/tests/gold_tests/tls/tls_client_verify3.test.py
@@ -80,7 +80,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
("-v -k --tls-max 1.2 --cert {1}.pem --key {1}.key --resolve 'aaa.com:{0}:127.0.0.1'" + " https://aaa.com:{0}/xyz").format(
- ts.Variables.ssl_port, Test.TestDirectory + "/ssl/aaa-signed"))
+ ts.Variables.ssl_port, Test.TestDirectory + "/ssl/aaa-signed"),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check response")
@@ -89,7 +90,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
("-v -k --tls-max 1.2 --cert {1}.pem --key {1}.key --resolve 'bbb-signed:{0}:127.0.0.1'" +
- " https://bbb-signed:{0}/xyz").format(ts.Variables.ssl_port, Test.TestDirectory + "/ssl/bbb-signed"))
+ " https://bbb-signed:{0}/xyz").format(ts.Variables.ssl_port, Test.TestDirectory + "/ssl/bbb-signed"),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check response")
@@ -98,7 +100,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
("-v -k --tls-max 1.2 --cert {1}.pem --key {1}.key --resolve 'ccc.com:{0}:127.0.0.1'" + " https://ccc.com:{0}/xyz").format(
- ts.Variables.ssl_port, Test.TestDirectory + "/ssl/ccc-signed"))
+ ts.Variables.ssl_port, Test.TestDirectory + "/ssl/ccc-signed"),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("error", "Check response")
@@ -109,7 +112,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
("-v -k --tls-max 1.2 --cert {1}.pem --key {1}.key --resolve 'aaa.com:{0}:127.0.0.1'" + " https://aaa.com:{0}/xyz").format(
- ts.Variables.ssl_port, Test.TestDirectory + "/ssl/bbb-signed"))
+ ts.Variables.ssl_port, Test.TestDirectory + "/ssl/bbb-signed"),
+ ts=ts)
tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun()
@@ -117,7 +121,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
("-v -k --tls-max 1.2 --cert {1}.pem --key {1}.key --resolve 'bbb.com:{0}:127.0.0.1'" + " https://bbb.com:{0}/xyz").format(
- ts.Variables.ssl_port, Test.TestDirectory + "/ssl/ccc-signed"))
+ ts.Variables.ssl_port, Test.TestDirectory + "/ssl/ccc-signed"),
+ ts=ts)
tr.Processes.Default.ReturnCode = 35
tr = Test.AddTestRun()
@@ -125,5 +130,6 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
(" -v -k --tls-max 1.2 --cert {1}.pem --key {1}.key --resolve 'ccc.com:{0}:127.0.0.1'" + " https://ccc.com:{0}/xyz").format(
- ts.Variables.ssl_port, Test.TestDirectory + "/ssl/aaa-signed"))
+ ts.Variables.ssl_port, Test.TestDirectory + "/ssl/aaa-signed"),
+ ts=ts)
tr.Processes.Default.ReturnCode = 35
diff --git a/tests/gold_tests/tls/tls_client_versions.test.py b/tests/gold_tests/tls/tls_client_versions.test.py
index 6a51d160e9..fcd53c265e 100644
--- a/tests/gold_tests/tls/tls_client_versions.test.py
+++ b/tests/gold_tests/tls/tls_client_versions.test.py
@@ -78,7 +78,8 @@ tr.Processes.Default.StartBefore(Test.Processes.ts)
# https://www.openssl.org/docs/manmaster/man3/SSL_CTX_set_security_level.html
tr.MakeCurlCommand(
"-v --ciphers DEFAULT@SECLEVEL=0 --tls-max 1.2 --tlsv1.2 --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 35
tr.StillRunningAfter = ts
@@ -86,7 +87,8 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("foo.com TLSv1")
tr.MakeCurlCommand(
"-v --ciphers DEFAULT@SECLEVEL=0 --tls-max 1.0 --tlsv1 --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
@@ -94,7 +96,8 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("bar.com TLSv1")
tr.MakeCurlCommand(
"-v --ciphers DEFAULT@SECLEVEL=0 --tls-max 1.0 --tlsv1 --resolve 'bar.com:{0}:127.0.0.1' -k https://bar.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 35
tr.StillRunningAfter = ts
@@ -102,6 +105,7 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("bar.com TLSv1_2")
tr.MakeCurlCommand(
"-v --ciphers DEFAULT@SECLEVEL=0 --tls-max 1.2 --tlsv1.2 --resolve 'bar.com:{0}:127.0.0.1' -k https://bar.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/tls/tls_client_versions_minmax.test.py b/tests/gold_tests/tls/tls_client_versions_minmax.test.py
index 7076cb9d1b..2ea7853580 100644
--- a/tests/gold_tests/tls/tls_client_versions_minmax.test.py
+++ b/tests/gold_tests/tls/tls_client_versions_minmax.test.py
@@ -83,7 +83,8 @@ tr.Processes.Default.StartBefore(Test.Processes.ts)
# https://www.openssl.org/docs/manmaster/man3/SSL_CTX_set_security_level.html
tr.MakeCurlCommand(
"-v --ciphers DEFAULT@SECLEVEL=0 --tls-max 1.2 --tlsv1.2 --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 35
tr.StillRunningAfter = ts
@@ -91,7 +92,8 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("foo.com TLSv1")
tr.MakeCurlCommand(
"-v --ciphers DEFAULT@SECLEVEL=0 --tls-max 1.0 --tlsv1 --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
@@ -99,7 +101,8 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("foo.com TLSv1_1")
tr.MakeCurlCommand(
"-v --ciphers DEFAULT@SECLEVEL=0 --tls-max 1.1 --tlsv1.1 --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
@@ -107,7 +110,8 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("bar.com TLSv1")
tr.MakeCurlCommand(
"-v --ciphers DEFAULT@SECLEVEL=0 --tls-max 1.0 --tlsv1 --resolve 'bar.com:{0}:127.0.0.1' -k https://bar.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 35
tr.StillRunningAfter = ts
@@ -115,6 +119,7 @@ tr.StillRunningAfter = ts
tr = Test.AddTestRun("bar.com TLSv1_2")
tr.MakeCurlCommand(
"-v --ciphers DEFAULT@SECLEVEL=0 --tls-max 1.2 --tlsv1.2 --resolve 'bar.com:{0}:127.0.0.1' -k https://bar.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/tls/tls_engine.test.py b/tests/gold_tests/tls/tls_engine.test.py
index a5a681cd34..623f430538 100644
--- a/tests/gold_tests/tls/tls_engine.test.py
+++ b/tests/gold_tests/tls/tls_engine.test.py
@@ -92,7 +92,7 @@ ts.Disk.MakeConfigFile('load_engine.cnf').AddLines(
# Make a basic request. Hopefully it goes through
tr = Test.AddTestRun("Run-Test")
-tr.MakeCurlCommand("-k -v -H uuid:basic -H host:example.com https://127.0.0.1:{0}/".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-k -v -H uuid:basic -H host:example.com https://127.0.0.1:{0}/".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts, ready=When.PortOpen(ts.Variables.ssl_port))
diff --git a/tests/gold_tests/tls/tls_hooks_client_verify.test.py b/tests/gold_tests/tls/tls_hooks_client_verify.test.py
index d1de6c8611..f25e80b489 100644
--- a/tests/gold_tests/tls/tls_hooks_client_verify.test.py
+++ b/tests/gold_tests/tls/tls_hooks_client_verify.test.py
@@ -78,7 +78,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./signed-foo.pem --key ./signed-foo.key --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}/case1"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.all = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
@@ -87,7 +88,8 @@ tr2.StillRunningAfter = ts
tr2.StillRunningAfter = server
tr2.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./signed-bar.pem --key ./signed-bar.key --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}/case1"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr2.Processes.Default.ReturnCode = 35
tr2.Processes.Default.Streams.all = Testers.ContainsExpression("error", "Curl attempt should have failed")
@@ -98,7 +100,8 @@ tr3.StillRunningAfter = ts
tr3.StillRunningAfter = server
tr3.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./server.pem --key ./server.key --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}/case1".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr3.Processes.Default.ReturnCode = 35
tr3.Processes.Default.Streams.all = Testers.ContainsExpression("error", "Curl attempt should have failed")
diff --git a/tests/gold_tests/tls/tls_hooks_verify.test.py b/tests/gold_tests/tls/tls_hooks_verify.test.py
index 8f7db12f9a..dd33443f05 100644
--- a/tests/gold_tests/tls/tls_hooks_verify.test.py
+++ b/tests/gold_tests/tls/tls_hooks_verify.test.py
@@ -65,21 +65,21 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand("--resolve \"foo.com:{0}:127.0.0.1\" -k https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("--resolve \"foo.com:{0}:127.0.0.1\" -k https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have failed")
tr2 = Test.AddTestRun("request bad name")
tr2.StillRunningAfter = ts
tr2.StillRunningAfter = server
-tr2.MakeCurlCommand("--resolve \"random.com:{0}:127.0.0.1\" -k https://random.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("--resolve \"random.com:{0}:127.0.0.1\" -k https://random.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.Processes.Default.ReturnCode = 0
tr2.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Curl attempt should have failed")
tr3 = Test.AddTestRun("request bad name permissive")
tr3.StillRunningAfter = ts
tr3.StillRunningAfter = server
-tr3.MakeCurlCommand("--resolve \"bar.com:{0}:127.0.0.1\" -k https://bar.com:{0}".format(ts.Variables.ssl_port))
+tr3.MakeCurlCommand("--resolve \"bar.com:{0}:127.0.0.1\" -k https://bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr3.Processes.Default.ReturnCode = 0
tr3.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have failed")
diff --git a/tests/gold_tests/tls/tls_keepalive.test.py b/tests/gold_tests/tls/tls_keepalive.test.py
index 88b8fcc5fe..3022e4f059 100644
--- a/tests/gold_tests/tls/tls_keepalive.test.py
+++ b/tests/gold_tests/tls/tls_keepalive.test.py
@@ -69,7 +69,7 @@ tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
- '-k -v --http1.1 -H \'host:example.com:{0}\' https://127.0.0.1:{0} https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+ '-k -v --http1.1 -H \'host:example.com:{0}\' https://127.0.0.1:{0} https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun("Test two HTTP/1.1 requests over two TLS connections")
@@ -77,14 +77,16 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommandMulti(
'{{curl}} -k -v --http1.1 -H \'host:example.com:{0}\' https://127.0.0.1:{0}; {{curl}} -k -v --http1.1 -H \'host:example.com:{0}\' https://127.0.0.1:{0}'
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun("Test two HTTP/2 requests over one TLS connection")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommandMulti(
- '{{curl}} -k -v --http2 -H \'host:example.com:{0}\' https://127.0.0.1:{0} https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+ '{{curl}} -k -v --http2 -H \'host:example.com:{0}\' https://127.0.0.1:{0} https://127.0.0.1:{0}'.format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr = Test.AddTestRun("Test two HTTP/2 requests over two TLS connections")
@@ -92,7 +94,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommandMulti(
'{{curl}} -k -v --http2 -H \'host:example.com:{0}\' https://127.0.0.1:{0}; {{curl}} -k -v --http1.1 -H \'host:example.com:{0}\' https://127.0.0.1:{0}'
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
# Just a check to flush out the traffic log until we have a clean shutdown for traffic_server
diff --git a/tests/gold_tests/tls/tls_ocsp.test.py b/tests/gold_tests/tls/tls_ocsp.test.py
index 84f74a1748..5a77f84aa9 100644
--- a/tests/gold_tests/tls/tls_ocsp.test.py
+++ b/tests/gold_tests/tls/tls_ocsp.test.py
@@ -67,5 +67,6 @@ tr.StillRunningAfter = server
tr.StillRunningAfter = ts
tr.MakeCurlCommand(
"-v --cacert {0} --cert-status -H \")host:example.com\" https://127.0.0.1:{1}".format(
- os.path.join(ts.Variables.SSLDir, "ca.ocsp.pem"), ts.Variables.ssl_port))
+ os.path.join(ts.Variables.SSLDir, "ca.ocsp.pem"), ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 0
diff --git a/tests/gold_tests/tls/tls_origin_session_reuse.test.py b/tests/gold_tests/tls/tls_origin_session_reuse.test.py
index 2dc8f96d42..5825ae64d5 100644
--- a/tests/gold_tests/tls/tls_origin_session_reuse.test.py
+++ b/tests/gold_tests/tls/tls_origin_session_reuse.test.py
@@ -134,7 +134,8 @@ ts4.Disk.records_config.update(
tr = Test.AddTestRun('new session then reuse')
tr.MakeCurlCommandMulti(
'{{curl}} https://127.0.0.1:{0}/reuse_session -k && {{curl}} https://127.0.0.1:{0}/reuse_session -k'.format(
- ts2.Variables.ssl_port))
+ ts2.Variables.ssl_port),
+ ts=ts2)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(ts1)
@@ -149,7 +150,8 @@ tr.StillRunningAfter += ts2
tr = Test.AddTestRun('remove oldest session, new session then reuse')
tr.MakeCurlCommandMulti(
'{{curl}} https://127.0.0.1:{0}/remove_oldest -k && {{curl}} https://127.0.0.1:{0}/remove_oldest -k'.format(
- ts2.Variables.ssl_port))
+ ts2.Variables.ssl_port),
+ ts=ts2)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ContainsExpression('curl test', 'Making sure the basics still work')
ts2.Disk.traffic_out.Content = Testers.ContainsExpression('remove oldest session', '')
@@ -158,7 +160,8 @@ ts2.Disk.traffic_out.Content += Testers.ContainsExpression('reused session to or
tr.StillRunningAfter = server
tr = Test.AddTestRun('disable origin session reuse, reuse should fail')
-tr.MakeCurlCommandMulti('{{curl}} https://127.0.0.1:{0} -k && {{curl}} https://127.0.0.1:{0} -k'.format(ts4.Variables.ssl_port))
+tr.MakeCurlCommandMulti(
+ '{{curl}} https://127.0.0.1:{0} -k && {{curl}} https://127.0.0.1:{0} -k'.format(ts4.Variables.ssl_port), ts=ts4)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(ts3)
tr.Processes.Default.StartBefore(ts4)
diff --git a/tests/gold_tests/tls/tls_partial_blind_tunnel.test.py b/tests/gold_tests/tls/tls_partial_blind_tunnel.test.py
index 67f4e88616..eab7b9fca1 100644
--- a/tests/gold_tests/tls/tls_partial_blind_tunnel.test.py
+++ b/tests/gold_tests/tls/tls_partial_blind_tunnel.test.py
@@ -61,7 +61,7 @@ ts.Disk.sni_yaml.AddLines(
])
tr = Test.AddTestRun("Partial Blind Route")
-tr.MakeCurlCommand("--http1.1 -v --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("--http1.1 -v --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server_bar)
tr.Processes.Default.StartBefore(nameserver)
diff --git a/tests/gold_tests/tls/tls_sni_groups.test.py b/tests/gold_tests/tls/tls_sni_groups.test.py
index 870f07de0e..16c1cce280 100644
--- a/tests/gold_tests/tls/tls_sni_groups.test.py
+++ b/tests/gold_tests/tls/tls_sni_groups.test.py
@@ -70,7 +70,8 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.MakeCurlCommand(
"-v --ciphers ECDHE-RSA-AES256-GCM-SHA384 --resolve 'bbb.com:{0}:127.0.0.1' -k https://bbb.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
ts.Disk.traffic_out.Content += Testers.ContainsExpression(
@@ -81,7 +82,8 @@ tr.Processes.Default.Streams.all = Testers.IncludesExpression(
tr = Test.AddTestRun("Test 1: fail")
tr.MakeCurlCommand(
"-v --ciphers ECDHE-RSA-AES256-GCM-SHA384 --resolve 'ccc.com:{0}:127.0.0.1' -k https://ccc.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
# The error code is 35, which indicates there was a ssl connection error
tr.ReturnCode = 35
tr.StillRunningAfter = ts
@@ -94,7 +96,8 @@ if Condition.HasOpenSSLVersion("3.5.0"):
tr = Test.AddTestRun("Test 2: X25519MLKEM768")
tr.MakeCurlCommand(
"-v --tls13-ciphers TLS_AES_256_GCM_SHA384 --resolve 'aaa.com:{0}:127.0.0.1' -k https://aaa.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
ts.Disk.traffic_out.Content += Testers.ContainsExpression(
diff --git a/tests/gold_tests/tls/tls_sni_host_policy.test.py b/tests/gold_tests/tls/tls_sni_host_policy.test.py
index 9fa4243582..03a6e172c0 100644
--- a/tests/gold_tests/tls/tls_sni_host_policy.test.py
+++ b/tests/gold_tests/tls/tls_sni_host_policy.test.py
@@ -79,7 +79,7 @@ tr.Processes.Default.StartBefore(server)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
- "-v --tls-max 1.2 -k -H 'host:dave' --resolve 'Bob:{0}:127.0.0.1' https://Bob:{0}/case1".format(ts.Variables.ssl_port))
+ "-v --tls-max 1.2 -k -H 'host:dave' --resolve 'Bob:{0}:127.0.0.1' https://Bob:{0}/case1".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 35
# case 2
@@ -92,7 +92,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"-v --tls-max 1.2 -k --cert ./signed-foo.pem --key ./signed-foo.key -H 'host:dave' --resolve 'Bob:{0}:127.0.0.1' https://Bob:{0}/case1"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
# case 3
@@ -102,7 +103,7 @@ tr = Test.AddTestRun("Connect to dave without cert")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
- "-v --tls-max 1.2 -k -H 'host:Bob' --resolve 'dave:{0}:127.0.0.1' https://dave:{0}/case1".format(ts.Variables.ssl_port))
+ "-v --tls-max 1.2 -k -H 'host:Bob' --resolve 'dave:{0}:127.0.0.1' https://dave:{0}/case1".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ContainsExpression("Access Denied", "Check response")
@@ -114,7 +115,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"-v --tls-max 1.2 -k --cert ./signed-foo.pem --key ./signed-foo.key -H 'host:bob' --resolve 'dave:{0}:127.0.0.1' https://dave:{0}/case1"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ContainsExpression("Access Denied", "Check response")
@@ -125,7 +127,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"--tls-max 1.2 -k --cert ./signed-foo.pem --key ./signed-foo.key -H 'host:boB' --resolve 'Bob:{0}:127.0.0.1' https://bob:{0}/case1"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("Access Denied", "Check response")
@@ -137,7 +140,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"-v --tls-max 1.2 -k -H 'host:Boblite' --resolve 'ellen:{0}:127.0.0.1' https://ellen:{0}/warnonly".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("Access Denied", "Check response")
@@ -149,7 +153,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"-v --tls-max 1.2 -k --cert ./signed-foo.pem --key ./signed-foo.key -H 'host:Boblite' --resolve 'ellen:{0}:127.0.0.1' https://ellen:{0}/warnonly"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("Access Denied", "Check response")
@@ -159,7 +164,8 @@ tr = Test.AddTestRun("Connect to ellen without cert")
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
- "-v --tls-max 1.2 -k -H 'host:fran' --resolve 'ellen:{0}:127.0.0.1' https://ellen:{0}/warnonly".format(ts.Variables.ssl_port))
+ "-v --tls-max 1.2 -k -H 'host:fran' --resolve 'ellen:{0}:127.0.0.1' https://ellen:{0}/warnonly".format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("Access Denied", "Check response")
@@ -170,7 +176,8 @@ tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
"-v --tls-max 1.2 -k --cert ./signed-foo.pem --key ./signed-foo.key -H 'host:fran' --resolve 'ellen:{0}:127.0.0.1' https://ellen:{0}/warnonly"
- .format(ts.Variables.ssl_port))
+ .format(ts.Variables.ssl_port),
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("Access Denied", "Check response")
diff --git a/tests/gold_tests/tls/tls_sni_yaml_reload.test.py b/tests/gold_tests/tls/tls_sni_yaml_reload.test.py
index 6f7a974e14..8e2e0b2772 100644
--- a/tests/gold_tests/tls/tls_sni_yaml_reload.test.py
+++ b/tests/gold_tests/tls/tls_sni_yaml_reload.test.py
@@ -67,8 +67,8 @@ tr.Processes.Default.StartBefore(server)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
tr.MakeCurlCommand(
- f"-q --tls-max 1.2 -s -v -k --cert ./signed-foo.pem --key ./signed-foo.key --resolve '{sni_domain}:{ts.Variables.ssl_port}:127.0.0.1' https://{sni_domain}:{ts.Variables.ssl_port}"
-)
+ f"-q --tls-max 1.2 -s -v -k --cert ./signed-foo.pem --key ./signed-foo.key --resolve '{sni_domain}:{ts.Variables.ssl_port}:127.0.0.1' https://{sni_domain}:{ts.Variables.ssl_port}",
+ ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Verify curl could successfully connect")
tr.Processes.Default.Streams.stderr = Testers.IncludesExpression(f"CN={sni_domain}", f"Verify curl used the {sni_domain} SNI")
@@ -113,8 +113,8 @@ tr3.Processes.Default.StartBefore(server2, ready=When.FileContains(ts.Disk.diags
tr3.StillRunningAfter = ts
tr3.StillRunningAfter = server
tr3.MakeCurlCommand(
- f"-q --tls-max 1.2 -s -v -k --cert ./signed-bar.pem --key ./signed-bar.key --resolve '{sni_domain}:{ts.Variables.ssl_port}:127.0.0.1' https://{sni_domain}:{ts.Variables.ssl_port}"
-)
+ f"-q --tls-max 1.2 -s -v -k --cert ./signed-bar.pem --key ./signed-bar.key --resolve '{sni_domain}:{ts.Variables.ssl_port}:127.0.0.1' https://{sni_domain}:{ts.Variables.ssl_port}",
+ ts=ts)
tr3.Processes.Default.ReturnCode = 0
# since the 2nd config with http2 turned on should have failed and used the prior config, verify http2 was not used
tr3.Processes.Default.Streams.stderr = Testers.ExcludesExpression("GET / HTTP/2", "Confirm that HTTP2 is still not used")
diff --git a/tests/gold_tests/tls/tls_tunnel.test.py b/tests/gold_tests/tls/tls_tunnel.test.py
index a849aea164..e2de6524af 100644
--- a/tests/gold_tests/tls/tls_tunnel.test.py
+++ b/tests/gold_tests/tls/tls_tunnel.test.py
@@ -126,7 +126,7 @@ ts.Disk.sni_yaml.AddLines(
tr = Test.AddTestRun("foo.com Tunnel-test")
tr.TimeOut = 5
-tr.MakeCurlCommand("-v --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server_foo)
tr.Processes.Default.StartBefore(server_bar)
@@ -146,7 +146,7 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("foo ok", "Should
tr = Test.AddTestRun("bob.bar.com Tunnel-test")
tr.TimeOut = 5
-tr.MakeCurlCommand("-v --resolve 'bob.bar.com:{0}:127.0.0.1' -k https://bob.bar.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v --resolve 'bob.bar.com:{0}:127.0.0.1' -k https://bob.bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
@@ -159,7 +159,7 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("foo ok", "Should
tr = Test.AddTestRun("bar.com no Tunnel-test")
tr.TimeOut = 5
-tr.MakeCurlCommand("-v --resolve 'bar.com:{0}:127.0.0.1' -k https://bar.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v --resolve 'bar.com:{0}:127.0.0.1' -k https://bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
@@ -168,7 +168,7 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("ATS", "Terminate
tr = Test.AddTestRun("no SNI Tunnel-test")
tr.TimeOut = 5
-tr.MakeCurlCommand("-v -k https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v -k https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
@@ -180,7 +180,8 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("bar ok", "Should
tr = Test.AddTestRun("one.match.com Tunnel-test")
tr.TimeOut = 5
-tr.MakeCurlCommand("-vvv --resolve 'one.match.com:{0}:127.0.0.1' -k https://one.match.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ "-vvv --resolve 'one.match.com:{0}:127.0.0.1' -k https://one.match.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
@@ -193,7 +194,8 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("foo ok", "Should
tr = Test.AddTestRun("one.ok.two.com Tunnel-test")
tr.TimeOut = 5
-tr.MakeCurlCommand("-vvv --resolve 'one.ok.two.com:{0}:127.0.0.1' -k https://one.ok.two.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ "-vvv --resolve 'one.ok.two.com:{0}:127.0.0.1' -k https://one.ok.two.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
@@ -207,7 +209,7 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("foo ok", "Should
tr = Test.AddTestRun("test {inbound_local_port}")
tr.TimeOut = 5
tr.MakeCurlCommand(
- "-vvv --resolve 'incoming.port.com:{0}:127.0.0.1' -k https://incoming.port.com:{0}".format(ts.Variables.ssl_port))
+ "-vvv --resolve 'incoming.port.com:{0}:127.0.0.1' -k https://incoming.port.com:{0}".format(ts.Variables.ssl_port), ts=ts)
# The tunnel connecting to the outgoing port which is the same as the incoming
# port (per the `inbound_local_port` configuration) will result in ATS
# connecting back to itself. This will result in a connection close and a
@@ -255,7 +257,8 @@ tr = Test.AddTestRun("test wildcard with inbound_local_port")
tr.TimeOut = 5
tr.MakeCurlCommand(
"-vvv --resolve 'wildcard.with.incoming.port.com:{0}:127.0.0.1' -k https://wildcard.with.incoming.port.com:{0}".format(
- ts.Variables.ssl_port))
+ ts.Variables.ssl_port),
+ ts=ts)
# See the inbound_local_port test above for the explanation of the return code.
tr.ReturnCode = 35
@@ -345,14 +348,14 @@ tr.TimeOut = 30
tr.StillRunningAfter = ts
# Wait for the reload to complete by running the sni_reload_done test
tr.Processes.Default.StartBefore(server2, ready=When.FileContains(ts.Disk.diags_log.Name, 'sni.yaml finished loading', 2))
-tr.MakeCurlCommand("-v --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.Streams.All += Testers.ContainsExpression("Not Found on Accelerato", "Terminates on on Traffic Server")
tr.Processes.Default.Streams.All += Testers.ContainsExpression("ATS", "Terminate on Traffic Server")
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
# Should tunnel to server_bar
tr = Test.AddTestRun("bar.com Tunnel-test")
-tr.MakeCurlCommand("-v --resolve 'bar.com:{0}:127.0.0.1' -k https://bar.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v --resolve 'bar.com:{0}:127.0.0.1' -k https://bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = ts
tr.Processes.Default.Streams.All += Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
diff --git a/tests/gold_tests/tls/tls_tunnel_forward.test.py b/tests/gold_tests/tls/tls_tunnel_forward.test.py
index e5ab811187..472797d10a 100644
--- a/tests/gold_tests/tls/tls_tunnel_forward.test.py
+++ b/tests/gold_tests/tls/tls_tunnel_forward.test.py
@@ -87,7 +87,7 @@ ts.Disk.sni_yaml.AddLines(
])
tr = Test.AddTestRun("Tunnel-test")
-tr.MakeCurlCommand("-v --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v --resolve 'foo.com:{0}:127.0.0.1' -k https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server_foo)
tr.Processes.Default.StartBefore(server_bar)
@@ -104,7 +104,7 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("ok foo", "Body i
tr2 = Test.AddTestRun("Forward-test")
tr2.MakeCurlCommand(
- "-v --http1.1 -H 'host:bar.com' --resolve 'bar.com:{0}:127.0.0.1' -k https://bar.com:{0}".format(ts.Variables.ssl_port))
+ "-v --http1.1 -H 'host:bar.com' --resolve 'bar.com:{0}:127.0.0.1' -k https://bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server_bar
tr2.StillRunningAfter = ts
@@ -116,7 +116,7 @@ tr2.Processes.Default.Streams.All += Testers.ContainsExpression("HTTP/1.1 200 OK
tr2.Processes.Default.Streams.All += Testers.ContainsExpression("ok bar", "Body is expected")
tr3 = Test.AddTestRun("no-sni-forward-test")
-tr3.MakeCurlCommand("--http1.1 -v -k -H 'host:random.com' https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr3.MakeCurlCommand("--http1.1 -v -k -H 'host:random.com' https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr3.ReturnCode = 0
tr3.StillRunningAfter = server_random
tr3.StillRunningAfter = ts
diff --git a/tests/gold_tests/tls/tls_verify.test.py b/tests/gold_tests/tls/tls_verify.test.py
index d6b4a5a674..64b32407f2 100644
--- a/tests/gold_tests/tls/tls_verify.test.py
+++ b/tests/gold_tests/tls/tls_verify.test.py
@@ -114,7 +114,7 @@ tr.Setup.Copy("ssl/signed-bar.key")
tr.Setup.Copy("ssl/signed-bar.pem")
tr.Setup.Copy("ssl/signed-wild.pem")
tr.Setup.Copy("ssl/signed-wild.key")
-tr.MakeCurlCommand("-v -k -H \"host: foo.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v -k -H \"host: foo.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server_foo)
tr.Processes.Default.StartBefore(server_bar)
@@ -126,28 +126,28 @@ tr.StillRunningAfter = ts
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr2 = Test.AddTestRun("Override-enforcing-Test")
-tr2.MakeCurlCommand("-v -k -H \"host: bar.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("-v -k -H \"host: bar.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr3 = Test.AddTestRun("Override-enforcing-Test-fail-name-check")
-tr3.MakeCurlCommand("-v -k -H \"host: bad_bar.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr3.MakeCurlCommand("-v -k -H \"host: bad_bar.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr3.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Curl attempt should have failed")
tr3.ReturnCode = 0
tr3.StillRunningAfter = server
tr3.StillRunningAfter = ts
tr4 = Test.AddTestRun("Exercise-wildcard-cert-name-check")
-tr4.MakeCurlCommand("-v -k -H \"host: foo.wild.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr4.MakeCurlCommand("-v -k -H \"host: foo.wild.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr4.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr4.ReturnCode = 0
tr4.StillRunningAfter = server
tr4.StillRunningAfter = ts
tr5 = Test.AddTestRun("Exercise-wildcard-cert-underscore-name-check")
-tr5.MakeCurlCommand("-v -k -H \"host: foo_bar.wild.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr5.MakeCurlCommand("-v -k -H \"host: foo_bar.wild.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr5.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr5.ReturnCode = 0
tr5.StillRunningAfter = server
diff --git a/tests/gold_tests/tls/tls_verify2.test.py b/tests/gold_tests/tls/tls_verify2.test.py
index 19b125abc2..db54aebba9 100644
--- a/tests/gold_tests/tls/tls_verify2.test.py
+++ b/tests/gold_tests/tls/tls_verify2.test.py
@@ -96,7 +96,7 @@ tr.Setup.Copy("ssl/signed-foo.key")
tr.Setup.Copy("ssl/signed-foo.pem")
tr.Setup.Copy("ssl/signed-bar.key")
tr.Setup.Copy("ssl/signed-bar.pem")
-tr.MakeCurlCommand("-k -H \"host: foo.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-k -H \"host: foo.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server_foo)
tr.Processes.Default.StartBefore(server_bar)
@@ -107,35 +107,35 @@ tr.StillRunningAfter = ts
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr2 = Test.AddTestRun("override-disabled")
-tr2.MakeCurlCommand("-k -H \"host: random.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("-k -H \"host: random.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr3 = Test.AddTestRun("override-permissive")
-tr3.MakeCurlCommand("-k -H \"host: bar.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr3.MakeCurlCommand("-k -H \"host: bar.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr3.ReturnCode = 0
tr3.StillRunningAfter = server
tr3.StillRunningAfter = ts
tr3.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr4 = Test.AddTestRun("override-permissive-bad-name")
-tr4.MakeCurlCommand("-k -H \"host: bad_bar.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr4.MakeCurlCommand("-k -H \"host: bad_bar.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr4.ReturnCode = 0
tr4.StillRunningAfter = server
tr4.StillRunningAfter = ts
tr4.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr5 = Test.AddTestRun("default-enforce-bad-sig")
-tr5.MakeCurlCommand("-k -H \"host: random2.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr5.MakeCurlCommand("-k -H \"host: random2.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr5.ReturnCode = 0
tr5.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Curl attempt should have failed")
tr5.StillRunningAfter = server
tr5.StillRunningAfter = ts
tr6 = Test.AddTestRun("default-enforce-fail")
-tr6.MakeCurlCommand("-k -H \"host: bad_foo.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr6.MakeCurlCommand("-k -H \"host: bad_foo.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr6.ReturnCode = 0
tr6.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Curl attempt should have failed")
tr6.StillRunningAfter = server
diff --git a/tests/gold_tests/tls/tls_verify3.test.py b/tests/gold_tests/tls/tls_verify3.test.py
index 3823f11573..08920ffc70 100644
--- a/tests/gold_tests/tls/tls_verify3.test.py
+++ b/tests/gold_tests/tls/tls_verify3.test.py
@@ -103,7 +103,7 @@ tr.Setup.Copy("ssl/signed-foo.key")
tr.Setup.Copy("ssl/signed-foo.pem")
tr.Setup.Copy("ssl/signed-bar.key")
tr.Setup.Copy("ssl/signed-bar.pem")
-tr.MakeCurlCommand("-v -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.Processes.Default.StartBefore(server_foo)
@@ -114,28 +114,29 @@ tr.StillRunningAfter = ts
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr = Test.AddTestRun("my.random.com Permissive-Test log failure")
-tr.MakeCurlCommand("-v -k --resolve 'my.random.com:{0}:127.0.0.1' https://my.random.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v -k --resolve 'my.random.com:{0}:127.0.0.1' https://my.random.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr2 = Test.AddTestRun("bob.bar.com Override-enforcing-Test")
-tr2.MakeCurlCommand("-v -k --resolve 'bob.bar.com:{0}:127.0.0.1' https://bob.bar.com:{0}/".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("-v -k --resolve 'bob.bar.com:{0}:127.0.0.1' https://bob.bar.com:{0}/".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Curl attempt should have succeeded")
tr3 = Test.AddTestRun("bob.foo.com override-enforcing-name-test")
-tr3.MakeCurlCommand("-v -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}/".format(ts.Variables.ssl_port))
+tr3.MakeCurlCommand("-v -k --resolve 'bob.foo.com:{0}:127.0.0.1' https://bob.foo.com:{0}/".format(ts.Variables.ssl_port), ts=ts)
tr3.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should not fail")
tr3.ReturnCode = 0
tr3.StillRunningAfter = server
tr3.StillRunningAfter = ts
tr3 = Test.AddTestRun("random.bar.com override-no-test")
-tr3.MakeCurlCommand("-v -k --resolve 'random.bar.com:{0}:127.0.0.1' https://random.bar.com:{0}".format(ts.Variables.ssl_port))
+tr3.MakeCurlCommand(
+ "-v -k --resolve 'random.bar.com:{0}:127.0.0.1' https://random.bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr3.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should not fail")
tr3.ReturnCode = 0
tr3.StillRunningAfter = server
diff --git a/tests/gold_tests/tls/tls_verify4.test.py b/tests/gold_tests/tls/tls_verify4.test.py
index fb027f1bba..bab0909322 100644
--- a/tests/gold_tests/tls/tls_verify4.test.py
+++ b/tests/gold_tests/tls/tls_verify4.test.py
@@ -91,7 +91,7 @@ tr.Setup.Copy("ssl/signed-foo.key")
tr.Setup.Copy("ssl/signed-foo.pem")
tr.Setup.Copy("ssl/signed-bar.key")
tr.Setup.Copy("ssl/signed-bar.pem")
-tr.MakeCurlCommand("-k -H \"host: random2.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-k -H \"host: random2.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server_foo)
tr.Processes.Default.StartBefore(server_bar)
@@ -139,7 +139,7 @@ trreload.Processes.Default.Env = ts.Env
trreload.Processes.Default.ReturnCode = 0
tragain = Test.AddTestRun("permissive-after-update")
-tragain.MakeCurlCommand("-k -H \"host: random3.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tragain.MakeCurlCommand("-k -H \"host: random3.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tragain.ReturnCode = 0
tragain.StillRunningAfter = server
tragain.StillRunningAfter = ts
@@ -182,7 +182,7 @@ trreload.Processes.Default.Env = ts.Env
trreload.Processes.Default.ReturnCode = 0
tragain = Test.AddTestRun("enforced-after-update")
-tragain.MakeCurlCommand("-k -H \"host: random4.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tragain.MakeCurlCommand("-k -H \"host: random4.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tragain.ReturnCode = 0
tragain.StillRunningAfter = server
tragain.StillRunningAfter = ts
diff --git a/tests/gold_tests/tls/tls_verify_base.test.py b/tests/gold_tests/tls/tls_verify_base.test.py
index 0a132fe00b..7526cfa2dc 100644
--- a/tests/gold_tests/tls/tls_verify_base.test.py
+++ b/tests/gold_tests/tls/tls_verify_base.test.py
@@ -96,7 +96,7 @@ tr.Setup.Copy("ssl/signed-foo.key")
tr.Setup.Copy("ssl/signed-foo.pem")
tr.Setup.Copy("ssl/signed-bar.key")
tr.Setup.Copy("ssl/signed-bar.pem")
-tr.MakeCurlCommand("-v -k -H \"host: foo.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v -k -H \"host: foo.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server_foo)
tr.Processes.Default.StartBefore(server_bar)
@@ -107,21 +107,21 @@ tr.StillRunningAfter = ts
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr = Test.AddTestRun("Permissive-Test with logged failure")
-tr.MakeCurlCommand("-v -k -H \"host: random.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v -k -H \"host: random.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr2 = Test.AddTestRun("Override-enforcing-Test")
-tr2.MakeCurlCommand("-v -k -H \"host: bar.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("-v -k -H \"host: bar.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr3 = Test.AddTestRun("Override-enforcing-Test-fail-name-check")
-tr3.MakeCurlCommand("-v -k -H \"host: bad_bar.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port))
+tr3.MakeCurlCommand("-v -k -H \"host: bad_bar.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port), ts=ts)
tr3.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Curl attempt should have failed")
tr3.ReturnCode = 0
tr3.StillRunningAfter = server
diff --git a/tests/gold_tests/tls/tls_verify_ca_override.test.py b/tests/gold_tests/tls/tls_verify_ca_override.test.py
index b0e13981bc..2de7f424d7 100644
--- a/tests/gold_tests/tls/tls_verify_ca_override.test.py
+++ b/tests/gold_tests/tls/tls_verify_ca_override.test.py
@@ -90,7 +90,7 @@ ts.Disk.records_config.update(
# Should succeed
tr = Test.AddTestRun("Use correct ca bundle for server 1")
-tr.MakeCurlCommand('-k -H \"host: foo.com\" http://127.0.0.1:{0}/case1'.format(ts.Variables.port))
+tr.MakeCurlCommand('-k -H \"host: foo.com\" http://127.0.0.1:{0}/case1'.format(ts.Variables.port), ts=ts)
tr.ReturnCode = 0
tr.Setup.Copy("ssl/signed-foo.key")
tr.Setup.Copy("ssl/signed-foo.pem")
@@ -104,7 +104,7 @@ tr.StillRunningAfter = ts
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr2 = Test.AddTestRun("Use incorrect ca bundle for server 1")
-tr2.MakeCurlCommand("-k -H \"host: bar.com\" http://127.0.0.1:{0}/badcase1".format(ts.Variables.port))
+tr2.MakeCurlCommand("-k -H \"host: bar.com\" http://127.0.0.1:{0}/badcase1".format(ts.Variables.port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server1
tr2.StillRunningAfter = ts
@@ -112,7 +112,7 @@ tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Curl attempt should have succeeded")
tr2 = Test.AddTestRun("Use correct ca bundle for server 2")
-tr2.MakeCurlCommand("-k -H \"host: random.com\" http://127.0.0.1:{0}/case2".format(ts.Variables.port))
+tr2.MakeCurlCommand("-k -H \"host: random.com\" http://127.0.0.1:{0}/case2".format(ts.Variables.port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server2
tr2.StillRunningAfter = ts
@@ -120,7 +120,7 @@ tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr3 = Test.AddTestRun("User incorrect ca bundle for server 2")
-tr3.MakeCurlCommand("-k -H \"host: foo.com\" http://127.0.0.1:{0}/badcase2".format(ts.Variables.port))
+tr3.MakeCurlCommand("-k -H \"host: foo.com\" http://127.0.0.1:{0}/badcase2".format(ts.Variables.port), ts=ts)
tr3.ReturnCode = 0
tr3.StillRunningAfter = server2
tr3.StillRunningAfter = ts
diff --git a/tests/gold_tests/tls/tls_verify_not_pristine.test.py b/tests/gold_tests/tls/tls_verify_not_pristine.test.py
index d44b511b20..2429f25620 100644
--- a/tests/gold_tests/tls/tls_verify_not_pristine.test.py
+++ b/tests/gold_tests/tls/tls_verify_not_pristine.test.py
@@ -81,7 +81,7 @@ tr.Setup.Copy("ssl/signed-foo.key")
tr.Setup.Copy("ssl/signed-foo.pem")
tr.Setup.Copy("ssl/signed-bar.key")
tr.Setup.Copy("ssl/signed-bar.pem")
-tr.MakeCurlCommand("-v --resolve 'bar.com:{0}:127.0.0.1' -k https://bar.com:{0}".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand("-v --resolve 'bar.com:{0}:127.0.0.1' -k https://bar.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(server_foo)
tr.Processes.Default.StartBefore(dns)
@@ -92,7 +92,7 @@ tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Conn
# foo.com in. bar.com out. Should not verify
tr2 = Test.AddTestRun("Enforced-bad-test")
-tr2.MakeCurlCommand("-v -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port))
+tr2.MakeCurlCommand("-v -k --resolve 'foo.com:{0}:127.0.0.1' https://foo.com:{0}".format(ts.Variables.ssl_port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
diff --git a/tests/gold_tests/tls/tls_verify_override.test.py b/tests/gold_tests/tls/tls_verify_override.test.py
index fab0876954..747a4d804c 100644
--- a/tests/gold_tests/tls/tls_verify_override.test.py
+++ b/tests/gold_tests/tls/tls_verify_override.test.py
@@ -133,7 +133,7 @@ tr.Setup.Copy("ssl/signed-foo.key")
tr.Setup.Copy("ssl/signed-foo.pem")
tr.Setup.Copy("ssl/signed-bar.key")
tr.Setup.Copy("ssl/signed-bar.pem")
-tr.MakeCurlCommand('-v -k -H \"host: foo.com\" http://127.0.0.1:{0}/basic'.format(ts.Variables.port))
+tr.MakeCurlCommand('-v -k -H \"host: foo.com\" http://127.0.0.1:{0}/basic'.format(ts.Variables.port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(dns)
tr.Processes.Default.StartBefore(server_foo)
@@ -147,7 +147,7 @@ tr.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connect
tr.Processes.Default.Streams.All += Testers.ContainsExpression("200 OK", "Curl attempt should have succeeded")
tr2 = Test.AddTestRun("default-permissive-fail")
-tr2.MakeCurlCommand("-v -k -H \"host: bar.com\" http://127.0.0.1:{0}/basic".format(ts.Variables.port))
+tr2.MakeCurlCommand("-v -k -H \"host: bar.com\" http://127.0.0.1:{0}/basic".format(ts.Variables.port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
@@ -156,7 +156,7 @@ tr2.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connec
tr2.Processes.Default.Streams.All += Testers.ContainsExpression("200 OK", "Curl attempt should have succeeded")
tr2 = Test.AddTestRun("default-permissive-fail2")
-tr2.MakeCurlCommand("-v -k -H \"host: random.com\" http://127.0.0.1:{0}/basic".format(ts.Variables.port))
+tr2.MakeCurlCommand("-v -k -H \"host: random.com\" http://127.0.0.1:{0}/basic".format(ts.Variables.port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
@@ -165,7 +165,7 @@ tr2.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connec
tr2.Processes.Default.Streams.All += Testers.ContainsExpression("404 Not Found", "Curl attempt should have succeeded")
tr3 = Test.AddTestRun("default-foo-to-bar")
-tr3.MakeCurlCommand("-k -v -H \"host: foo.com\" http://127.0.0.1:{0}/basictobar".format(ts.Variables.port))
+tr3.MakeCurlCommand("-k -v -H \"host: foo.com\" http://127.0.0.1:{0}/basictobar".format(ts.Variables.port), ts=ts)
tr3.ReturnCode = 0
tr3.StillRunningAfter = server
tr3.StillRunningAfter = ts
@@ -174,7 +174,7 @@ tr3.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connec
tr3.Processes.Default.Streams.All += Testers.ContainsExpression("200 OK", "Curl attempt should have succeeded")
tr3 = Test.AddTestRun("override-foo")
-tr3.MakeCurlCommand("-k -v -H \"host: foo.com\" http://127.0.0.1:{0}/override".format(ts.Variables.port))
+tr3.MakeCurlCommand("-k -v -H \"host: foo.com\" http://127.0.0.1:{0}/override".format(ts.Variables.port), ts=ts)
tr3.ReturnCode = 0
tr3.StillRunningAfter = server
tr3.StillRunningAfter = ts
@@ -183,7 +183,7 @@ tr3.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connec
tr3.Processes.Default.Streams.All += Testers.ContainsExpression("200 OK", "Curl attempt should have succeeded")
tr4 = Test.AddTestRun("override-bar-disabled")
-tr4.MakeCurlCommand("-k -v -H \"host: bad_bar.com\" http://127.0.0.1:{0}/overridedisabled".format(ts.Variables.port))
+tr4.MakeCurlCommand("-k -v -H \"host: bad_bar.com\" http://127.0.0.1:{0}/overridedisabled".format(ts.Variables.port), ts=ts)
tr4.ReturnCode = 0
tr4.StillRunningAfter = server
tr4.StillRunningAfter = ts
@@ -192,7 +192,7 @@ tr4.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connec
tr4.Processes.Default.Streams.All += Testers.ContainsExpression("200 OK", "Curl attempt should have succeeded")
tr5 = Test.AddTestRun("override-bar-signature-enforced")
-tr5.MakeCurlCommand("-k -v -H \"host: bar.com\" http://127.0.0.1:{0}/overridesignature".format(ts.Variables.port))
+tr5.MakeCurlCommand("-k -v -H \"host: bar.com\" http://127.0.0.1:{0}/overridesignature".format(ts.Variables.port), ts=ts)
tr5.ReturnCode = 0
tr5.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr5.Processes.Default.Streams.All += Testers.ContainsExpression("200 OK", "Curl attempt should have succeeded")
@@ -200,7 +200,7 @@ tr5.StillRunningAfter = server
tr5.StillRunningAfter = ts
tr5a = Test.AddTestRun("override-bar-none-permissive")
-tr5a.MakeCurlCommand("-k -v -H \"host: bar.com\" http://127.0.0.1:{0}/overridenone".format(ts.Variables.port))
+tr5a.MakeCurlCommand("-k -v -H \"host: bar.com\" http://127.0.0.1:{0}/overridenone".format(ts.Variables.port), ts=ts)
tr5a.ReturnCode = 0
tr5a.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr5a.Processes.Default.Streams.All += Testers.ContainsExpression("200 OK", "Curl attempt should have succeeded")
@@ -208,7 +208,7 @@ tr5a.StillRunningAfter = server
tr5a.StillRunningAfter = ts
tr6 = Test.AddTestRun("override-bar-enforced")
-tr6.MakeCurlCommand("-v -k -H \"host: bar.com\" http://127.0.0.1:{0}/overrideenforced".format(ts.Variables.port))
+tr6.MakeCurlCommand("-v -k -H \"host: bar.com\" http://127.0.0.1:{0}/overrideenforced".format(ts.Variables.port), ts=ts)
tr6.ReturnCode = 0
# Should fail
tr6.Processes.Default.Streams.All = Testers.ContainsExpression("Could Not Connect", "Curl attempt should have failed")
@@ -217,7 +217,7 @@ tr6.StillRunningAfter = ts
# Should succeed
tr = Test.AddTestRun("foo-to-bar-sni-policy-remap")
-tr.MakeCurlCommand("-v -k -H \"host: foo.com\" http://127.0.0.1:{0}/snipolicybarremap".format(ts.Variables.port))
+tr.MakeCurlCommand("-v -k -H \"host: foo.com\" http://127.0.0.1:{0}/snipolicybarremap".format(ts.Variables.port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
@@ -226,7 +226,7 @@ tr.Processes.Default.Streams.All += Testers.ContainsExpression("200 OK", "Curl a
# Should fail
tr = Test.AddTestRun("foo-to-bar-sni-policy-host")
-tr.MakeCurlCommand("-v -k -H \"host: foo.com\" http://127.0.0.1:{0}/snipolicybarhost".format(ts.Variables.port))
+tr.MakeCurlCommand("-v -k -H \"host: foo.com\" http://127.0.0.1:{0}/snipolicybarhost".format(ts.Variables.port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
@@ -234,7 +234,7 @@ tr.Processes.Default.Streams.All = Testers.ContainsExpression("Could not connect
# Should fail
tr = Test.AddTestRun("bar-to-foo-sni-policy-remap")
-tr.MakeCurlCommand("-v -k -H \"host: bar.com\" http://127.0.0.1:{0}/snipolicyfooremap".format(ts.Variables.port))
+tr.MakeCurlCommand("-v -k -H \"host: bar.com\" http://127.0.0.1:{0}/snipolicyfooremap".format(ts.Variables.port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
@@ -242,7 +242,7 @@ tr.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could not conn
# Should succeed
tr = Test.AddTestRun("bar-to-foo-sni-policy-host")
-tr.MakeCurlCommand("-v -k -H \"host: bar.com\" http://127.0.0.1:{0}/snipolicyfoohost".format(ts.Variables.port))
+tr.MakeCurlCommand("-v -k -H \"host: bar.com\" http://127.0.0.1:{0}/snipolicyfoohost".format(ts.Variables.port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/tls/tls_verify_override_base.test.py b/tests/gold_tests/tls/tls_verify_override_base.test.py
index 1c00a6638b..be8179ddac 100644
--- a/tests/gold_tests/tls/tls_verify_override_base.test.py
+++ b/tests/gold_tests/tls/tls_verify_override_base.test.py
@@ -129,7 +129,7 @@ tr.Setup.Copy("ssl/signed-foo.key")
tr.Setup.Copy("ssl/signed-foo.pem")
tr.Setup.Copy("ssl/signed-bar.key")
tr.Setup.Copy("ssl/signed-bar.pem")
-tr.MakeCurlCommand('-k -H \"host: foo.com\" http://127.0.0.1:{0}/basic'.format(ts.Variables.port))
+tr.MakeCurlCommand('-k -H \"host: foo.com\" http://127.0.0.1:{0}/basic'.format(ts.Variables.port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(dns)
tr.Processes.Default.StartBefore(server_foo)
@@ -142,7 +142,7 @@ tr.StillRunningAfter = ts
tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr2 = Test.AddTestRun("default-permissive-fail")
-tr2.MakeCurlCommand("-k -H \"host: bar.com\" http://127.0.0.1:{0}/basic".format(ts.Variables.port))
+tr2.MakeCurlCommand("-k -H \"host: bar.com\" http://127.0.0.1:{0}/basic".format(ts.Variables.port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
@@ -150,7 +150,7 @@ tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr2 = Test.AddTestRun("default-permissive-fail2")
-tr2.MakeCurlCommand("-k -H \"host: random.com\" http://127.0.0.1:{0}/basic".format(ts.Variables.port))
+tr2.MakeCurlCommand("-k -H \"host: random.com\" http://127.0.0.1:{0}/basic".format(ts.Variables.port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = server
tr2.StillRunningAfter = ts
@@ -158,7 +158,7 @@ tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr3 = Test.AddTestRun("override-foo")
-tr3.MakeCurlCommand("-k -H \"host: foo.com\" http://127.0.0.1:{0}/override".format(ts.Variables.port))
+tr3.MakeCurlCommand("-k -H \"host: foo.com\" http://127.0.0.1:{0}/override".format(ts.Variables.port), ts=ts)
tr3.ReturnCode = 0
tr3.StillRunningAfter = server
tr3.StillRunningAfter = ts
@@ -166,7 +166,7 @@ tr3.StillRunningAfter = ts
tr3.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr4 = Test.AddTestRun("override-bar-disabled")
-tr4.MakeCurlCommand("-k -H \"host: bad_bar.com\" http://127.0.0.1:{0}/overridedisabled".format(ts.Variables.port))
+tr4.MakeCurlCommand("-k -H \"host: bad_bar.com\" http://127.0.0.1:{0}/overridedisabled".format(ts.Variables.port), ts=ts)
tr4.ReturnCode = 0
tr4.StillRunningAfter = server
tr4.StillRunningAfter = ts
@@ -174,14 +174,14 @@ tr4.StillRunningAfter = ts
tr4.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr5 = Test.AddTestRun("override-bar-signature-enforced")
-tr5.MakeCurlCommand("-k -H \"host: bar.com\" http://127.0.0.1:{0}/overridesignature".format(ts.Variables.port))
+tr5.MakeCurlCommand("-k -H \"host: bar.com\" http://127.0.0.1:{0}/overridesignature".format(ts.Variables.port), ts=ts)
tr5.ReturnCode = 0
tr5.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
tr5.StillRunningAfter = server
tr5.StillRunningAfter = ts
tr6 = Test.AddTestRun("override-bar-enforced")
-tr6.MakeCurlCommand("-k -H \"host: bar.com\" http://127.0.0.1:{0}/overrideenforced".format(ts.Variables.port))
+tr6.MakeCurlCommand("-k -H \"host: bar.com\" http://127.0.0.1:{0}/overrideenforced".format(ts.Variables.port), ts=ts)
tr6.ReturnCode = 0
# Should fail
tr6.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Curl attempt should have failed")
@@ -190,7 +190,7 @@ tr6.StillRunningAfter = ts
# Should succeed
tr = Test.AddTestRun("foo-to-bar-sni-policy-remap")
-tr.MakeCurlCommand("-k -H \"host: foo.com\" http://127.0.0.1:{0}/snipolicybarremap".format(ts.Variables.port))
+tr.MakeCurlCommand("-k -H \"host: foo.com\" http://127.0.0.1:{0}/snipolicybarremap".format(ts.Variables.port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
@@ -198,7 +198,7 @@ tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could not conn
# Should fail
tr = Test.AddTestRun("foo-to-bar-sni-policy-host")
-tr.MakeCurlCommand("-k -H \"host: foo.com\" http://127.0.0.1:{0}/snipolicybarhost".format(ts.Variables.port))
+tr.MakeCurlCommand("-k -H \"host: foo.com\" http://127.0.0.1:{0}/snipolicybarhost".format(ts.Variables.port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
@@ -206,7 +206,8 @@ tr.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could not conn
# Should fail
tr = Test.AddTestRun("foo-to-bar-sni-policy-servername")
-tr.MakeCurlCommand("-k --resolve foo.com:{0}:127.0.0.1 https://foo.com:{0}/snipolicybarservername".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ "-k --resolve foo.com:{0}:127.0.0.1 https://foo.com:{0}/snipolicybarservername".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
@@ -214,7 +215,7 @@ tr.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could not conn
# Should fail
tr = Test.AddTestRun("bar-to-foo-sni-policy-remap")
-tr.MakeCurlCommand("-k -H \"host: bar.com\" http://127.0.0.1:{0}/snipolicyfooremap".format(ts.Variables.port))
+tr.MakeCurlCommand("-k -H \"host: bar.com\" http://127.0.0.1:{0}/snipolicyfooremap".format(ts.Variables.port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
@@ -222,7 +223,7 @@ tr.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could not conn
# Should succeed
tr = Test.AddTestRun("bar-to-foo-sni-policy-host")
-tr.MakeCurlCommand("-k -H \"host: bar.com\" http://127.0.0.1:{0}/snipolicyfoohost".format(ts.Variables.port))
+tr.MakeCurlCommand("-k -H \"host: bar.com\" http://127.0.0.1:{0}/snipolicyfoohost".format(ts.Variables.port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
@@ -230,7 +231,8 @@ tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could not conn
# Should succeed
tr = Test.AddTestRun("bar-to-foo-sni-policy-servername")
-tr.MakeCurlCommand("-k --resolve bar.com:{0}:127.0.0.1 https://bar.com:{0}/snipolicyfooservername".format(ts.Variables.ssl_port))
+tr.MakeCurlCommand(
+ "-k --resolve bar.com:{0}:127.0.0.1 https://bar.com:{0}/snipolicyfooservername".format(ts.Variables.ssl_port), ts=ts)
tr.ReturnCode = 0
tr.StillRunningAfter = server
tr.StillRunningAfter = ts
diff --git a/tests/gold_tests/tls/tls_verify_override_sni.test.py b/tests/gold_tests/tls/tls_verify_override_sni.test.py
index bff498f6be..97391eb876 100644
--- a/tests/gold_tests/tls/tls_verify_override_sni.test.py
+++ b/tests/gold_tests/tls/tls_verify_override_sni.test.py
@@ -123,7 +123,7 @@ tr.Setup.Copy("ssl/signed-foo.key")
tr.Setup.Copy("ssl/signed-foo.pem")
tr.Setup.Copy("ssl/signed-bar.key")
tr.Setup.Copy("ssl/signed-bar.pem")
-tr.MakeCurlCommand('-k -H \"host: foo.com\" http://127.0.0.1:{0}/defaultbar'.format(ts.Variables.port))
+tr.MakeCurlCommand('-k -H \"host: foo.com\" http://127.0.0.1:{0}/defaultbar'.format(ts.Variables.port), ts=ts)
tr.ReturnCode = 0
tr.Processes.Default.StartBefore(dns)
tr.Processes.Default.StartBefore(server_foo)
@@ -134,14 +134,14 @@ tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Conn
# should fail. Exercise the override
tr2 = Test.AddTestRun("policy-override-fail")
-tr2.MakeCurlCommand("-k -H \"host: foo.com\" http://127.0.0.1:{0}/overridepolicy".format(ts.Variables.port))
+tr2.MakeCurlCommand("-k -H \"host: foo.com\" http://127.0.0.1:{0}/overridepolicy".format(ts.Variables.port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Curl attempt should fail")
# should succeed with an error message
tr2 = Test.AddTestRun("properties-override-permissive")
-tr2.MakeCurlCommand("-k -H \"host: foo.com\" http://127.0.0.1:{0}/overrideproperties".format(ts.Variables.port))
+tr2.MakeCurlCommand("-k -H \"host: foo.com\" http://127.0.0.1:{0}/overrideproperties".format(ts.Variables.port), ts=ts)
tr2.ReturnCode = 0
tr2.StillRunningAfter = ts
tr2.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded")
diff --git a/tests/gold_tests/tls_hooks/tls_hooks.test.py b/tests/gold_tests/tls_hooks/tls_hooks.test.py
index b02798cba8..ffb2050326 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks.test.py
@@ -55,7 +55,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-v -k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-v -k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/preaccept-1.gold"
tr.Processes.Default.Streams.All = Testers.ExcludesExpression(
diff --git a/tests/gold_tests/tls_hooks/tls_hooks10.test.py b/tests/gold_tests/tls_hooks/tls_hooks10.test.py
index f90ae71e00..fb52206ed2 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks10.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks10.test.py
@@ -53,7 +53,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
ts.Disk.traffic_out.Content = "gold/ts-cert-1-im-2.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks11.test.py b/tests/gold_tests/tls_hooks/tls_hooks11.test.py
index 40af0b331e..f92b7dc593 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks11.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks11.test.py
@@ -54,7 +54,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/preaccept-1.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks12.test.py b/tests/gold_tests/tls_hooks/tls_hooks12.test.py
index 28363a19b2..78f369691f 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks12.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks12.test.py
@@ -53,7 +53,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
ts.Disk.traffic_out.Content = "gold/ts-preaccept-delayed-1-immdate-2.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks13.test.py b/tests/gold_tests/tls_hooks/tls_hooks13.test.py
index 1275305602..d9820afe05 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks13.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks13.test.py
@@ -53,7 +53,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
ts.Disk.traffic_out.Content = "gold/ts-out-start-close-2.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks14.test.py b/tests/gold_tests/tls_hooks/tls_hooks14.test.py
index 1f9586ef5a..8364fac306 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks14.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks14.test.py
@@ -54,7 +54,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
ts.Disk.traffic_out.Content = "gold/ts-out-delay-start-2.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks15.test.py b/tests/gold_tests/tls_hooks/tls_hooks15.test.py
index 9c09cde6c8..fd2aa270b5 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks15.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks15.test.py
@@ -53,7 +53,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
ts.Disk.traffic_out.Content = "gold/ts-close-out-close.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks16.test.py b/tests/gold_tests/tls_hooks/tls_hooks16.test.py
index 2278a135eb..7804292634 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks16.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks16.test.py
@@ -56,7 +56,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/client-hello-1.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks17.test.py b/tests/gold_tests/tls_hooks/tls_hooks17.test.py
index 5ff52fdcf3..34a48e98d9 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks17.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks17.test.py
@@ -56,7 +56,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/client-hello-1.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks18.test.py b/tests/gold_tests/tls_hooks/tls_hooks18.test.py
index aa5389db3b..64e7b3b089 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks18.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks18.test.py
@@ -56,7 +56,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/preaccept-1.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks2.test.py b/tests/gold_tests/tls_hooks/tls_hooks2.test.py
index fd977da02d..66afffac59 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks2.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks2.test.py
@@ -54,7 +54,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/preaccept-1.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks3.test.py b/tests/gold_tests/tls_hooks/tls_hooks3.test.py
index 3770592d41..006eecb479 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks3.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks3.test.py
@@ -54,7 +54,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/preaccept-1.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks4.test.py b/tests/gold_tests/tls_hooks/tls_hooks4.test.py
index 33e46a2b76..f7e0742baa 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks4.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks4.test.py
@@ -54,7 +54,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/preaccept-1.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks6.test.py b/tests/gold_tests/tls_hooks/tls_hooks6.test.py
index 6752239ee8..8e943fd3a9 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks6.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks6.test.py
@@ -54,7 +54,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/preaccept-1.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks7.test.py b/tests/gold_tests/tls_hooks/tls_hooks7.test.py
index 201f047db5..29a4490e28 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks7.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks7.test.py
@@ -54,7 +54,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/preaccept-1.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks8.test.py b/tests/gold_tests/tls_hooks/tls_hooks8.test.py
index fcad1a4cb9..721ce3630b 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks8.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks8.test.py
@@ -54,7 +54,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/preaccept-1.gold"
diff --git a/tests/gold_tests/tls_hooks/tls_hooks9.test.py b/tests/gold_tests/tls_hooks/tls_hooks9.test.py
index 4e20f8a362..cf77135203 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks9.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks9.test.py
@@ -54,7 +54,7 @@ tr.Processes.Default.StartBefore(server)
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.StillRunningAfter = ts
tr.StillRunningAfter = server
-tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port))
+tr.MakeCurlCommand('-k -H \'host:example.com:{0}\' https://127.0.0.1:{0}'.format(ts.Variables.ssl_port), ts=ts)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stdout = "gold/preaccept-1.gold"
diff --git a/tests/gold_tests/traffic_ctl/remap_inc/remap_inc.test.py b/tests/gold_tests/traffic_ctl/remap_inc/remap_inc.test.py
index ae67d89963..52984a8ad6 100644
--- a/tests/gold_tests/traffic_ctl/remap_inc/remap_inc.test.py
+++ b/tests/gold_tests/traffic_ctl/remap_inc/remap_inc.test.py
@@ -66,7 +66,7 @@ tr.Processes.Default.ReturnCode = 0
... 68 lines suppressed ...