You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by rr...@apache.org on 2022/10/13 18:27:06 UTC
[trafficserver] branch master updated: tests: select_ports defaults to True, remove explicit setting (#9142)
This is an automated email from the ASF dual-hosted git repository.
rrm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 46eb6baee tests: select_ports defaults to True, remove explicit setting (#9142)
46eb6baee is described below
commit 46eb6baeec7cb232c419ebee5b567bc285cdb5b9
Author: Randall Meyer <rr...@apache.org>
AuthorDate: Thu Oct 13 11:26:59 2022 -0700
tests: select_ports defaults to True, remove explicit setting (#9142)
---
doc/developer-guide/testing/blackbox-testing.en.rst | 2 +-
tests/gold_tests/basic/basic-manager.test.py | 2 +-
tests/gold_tests/basic/basic.test.py | 2 +-
tests/gold_tests/cache/background_fill.test.py | 2 +-
tests/gold_tests/chunked_encoding/bad_chunked_encoding.test.py | 2 +-
tests/gold_tests/chunked_encoding/chunked_encoding.test.py | 2 +-
tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py | 2 +-
tests/gold_tests/connect/connect.test.py | 2 +-
tests/gold_tests/continuations/double.test.py | 2 +-
tests/gold_tests/continuations/double_h2.test.py | 2 +-
tests/gold_tests/continuations/openclose_h2.test.py | 2 +-
tests/gold_tests/dns/dns_ttl.test.py | 2 +-
tests/gold_tests/dns/splitdns.test.py | 2 +-
tests/gold_tests/h2/h2disable.test.py | 2 +-
tests/gold_tests/h2/h2disable_no_accept_threads.test.py | 2 +-
tests/gold_tests/h2/http2.test.py | 2 +-
tests/gold_tests/h2/http2_priority.test.py | 2 +-
tests/gold_tests/h2/httpbin.test.py | 2 +-
tests/gold_tests/h2/nghttp.test.py | 2 +-
tests/gold_tests/headers/hsts.test.py | 2 +-
tests/gold_tests/headers/normalize_ae.test.py | 4 ++--
tests/gold_tests/ip_allow/ip_allow.test.py | 2 +-
.../pluginTest/client_context_dump/client_context_dump.test.py | 2 +-
tests/gold_tests/pluginTest/lua/lua_states_stats.test.py | 2 +-
.../pluginTest/regex_revalidate/regex_revalidate.test.py | 2 +-
tests/gold_tests/pluginTest/remap_stats/remap_stats.test.py | 2 +-
.../gold_tests/pluginTest/remap_stats/remap_stats_post.test.py | 2 +-
.../pluginTest/server_push_preload/server_push_preload.test.py | 2 +-
.../pluginTest/stats_over_http/stats_over_http.test.py | 2 +-
tests/gold_tests/pluginTest/stek_share/stek_share.test.py | 10 +++++-----
tests/gold_tests/pluginTest/test_hooks/hook_add.test.py | 2 +-
.../pluginTest/test_hooks/ssn_start_delay_hook.test.py | 2 +-
tests/gold_tests/pluginTest/test_hooks/test_hooks.test.py | 2 +-
.../pluginTest/traffic_dump/traffic_dump_sni_filter.test.py | 2 +-
tests/gold_tests/pluginTest/tsapi/tsapi.test.py | 2 +-
tests/gold_tests/pluginTest/url_sig/url_sig.test.py | 2 +-
tests/gold_tests/post/post-continue.test.py | 4 ++--
tests/gold_tests/post/post-early-return.test.py | 2 +-
.../post_slow_server/post_slow_server_max_requests_in.test.py | 2 +-
tests/gold_tests/proxy_protocol/proxy_protocol.test.py | 2 +-
tests/gold_tests/remap/conf_remap_float.test.py | 2 +-
tests/gold_tests/remap/remap_reload.test.py | 2 +-
tests/gold_tests/slow_post/slow_post.test.py | 2 +-
tests/gold_tests/timeout/accept_timeout.test.py | 2 +-
tests/gold_tests/timeout/active_timeout.test.py | 4 ++--
tests/gold_tests/timeout/inactive_client_timeout.test.py | 2 +-
tests/gold_tests/timeout/inactive_timeout.test.py | 2 +-
tests/gold_tests/tls/ssl_multicert_loader.test.py | 4 ++--
tests/gold_tests/tls/tls.test.py | 2 +-
tests/gold_tests/tls/tls_bad_alpn.test.py | 2 +-
tests/gold_tests/tls/tls_check_cert_select_plugin.test.py | 2 +-
tests/gold_tests/tls/tls_check_dual_cert_selection.test.py | 2 +-
tests/gold_tests/tls/tls_check_dual_cert_selection2.test.py | 2 +-
.../tls/tls_check_dual_cert_selection_plugin.test.py | 2 +-
tests/gold_tests/tls/tls_client_cert.test.py | 2 +-
tests/gold_tests/tls/tls_client_cert2.test.py | 2 +-
tests/gold_tests/tls/tls_client_cert2_plugin.test.py | 2 +-
tests/gold_tests/tls/tls_client_cert_override.test.py | 2 +-
tests/gold_tests/tls/tls_client_cert_override_plugin.test.py | 2 +-
tests/gold_tests/tls/tls_client_cert_plugin.test.py | 2 +-
tests/gold_tests/tls/tls_client_verify.test.py | 2 +-
tests/gold_tests/tls/tls_client_verify2.test.py | 2 +-
tests/gold_tests/tls/tls_client_verify3.test.py | 2 +-
tests/gold_tests/tls/tls_client_versions.test.py | 2 +-
tests/gold_tests/tls/tls_engine.test.py | 2 +-
tests/gold_tests/tls/tls_forward_nonhttp.test.py | 2 +-
tests/gold_tests/tls/tls_hooks_client_verify.test.py | 2 +-
tests/gold_tests/tls/tls_hooks_verify.test.py | 2 +-
tests/gold_tests/tls/tls_keepalive.test.py | 2 +-
tests/gold_tests/tls/tls_ocsp.test.py | 2 +-
tests/gold_tests/tls/tls_origin_session_reuse.test.py | 8 ++++----
tests/gold_tests/tls/tls_partial_blind_tunnel.test.py | 2 +-
tests/gold_tests/tls/tls_session_reuse.test.py | 6 +++---
tests/gold_tests/tls/tls_sni_host_policy.test.py | 2 +-
tests/gold_tests/tls/tls_ticket.test.py | 4 ++--
tests/gold_tests/tls/tls_tunnel.test.py | 2 +-
tests/gold_tests/tls/tls_tunnel_forward.test.py | 2 +-
tests/gold_tests/tls/tls_verify.test.py | 2 +-
tests/gold_tests/tls/tls_verify2.test.py | 2 +-
tests/gold_tests/tls/tls_verify3.test.py | 2 +-
tests/gold_tests/tls/tls_verify_base.test.py | 2 +-
tests/gold_tests/tls/tls_verify_ca_override.test.py | 2 +-
tests/gold_tests/tls/tls_verify_not_pristine.test.py | 2 +-
tests/gold_tests/tls/tls_verify_override.test.py | 2 +-
tests/gold_tests/tls/tls_verify_override_base.test.py | 2 +-
tests/gold_tests/tls/tls_verify_override_sni.test.py | 2 +-
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 +-
103 files changed, 117 insertions(+), 117 deletions(-)
diff --git a/doc/developer-guide/testing/blackbox-testing.en.rst b/doc/developer-guide/testing/blackbox-testing.en.rst
index 25af57aec..db1b1908c 100644
--- a/doc/developer-guide/testing/blackbox-testing.en.rst
+++ b/doc/developer-guide/testing/blackbox-testing.en.rst
@@ -86,7 +86,7 @@ TrafficServer
For TrafficServer, we have defined the following functions and objects in ``tests/gold_tests/autest-site/trafficserver.test.ext``:
-- ``MakeATSProcess(obj, name, command='traffic_server', select_ports=True, enable_tls=False)``
+- ``MakeATSProcess(obj, name, command='traffic_server', enable_tls=False)``
- name - A name for this instance of ATS
- command - optional argument defining what process to use. Defaults to ``traffic_server``
diff --git a/tests/gold_tests/basic/basic-manager.test.py b/tests/gold_tests/basic/basic-manager.test.py
index 909ae349d..4a7e238f2 100644
--- a/tests/gold_tests/basic/basic-manager.test.py
+++ b/tests/gold_tests/basic/basic-manager.test.py
@@ -20,7 +20,7 @@ Test.Summary = '''
Test that Trafficserver starts with default configurations.
'''
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager")
t = Test.AddTestRun("Test traffic server started properly")
t.StillRunningAfter = Test.Processes.ts
diff --git a/tests/gold_tests/basic/basic.test.py b/tests/gold_tests/basic/basic.test.py
index 4fc638483..6cda6da2e 100644
--- a/tests/gold_tests/basic/basic.test.py
+++ b/tests/gold_tests/basic/basic.test.py
@@ -20,7 +20,7 @@ Test.Summary = '''
Test that Trafficserver starts with default configurations.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True)
+ts = Test.MakeATSProcess("ts")
t = Test.AddTestRun("Test traffic server started properly")
t.StillRunningAfter = Test.Processes.ts
diff --git a/tests/gold_tests/cache/background_fill.test.py b/tests/gold_tests/cache/background_fill.test.py
index 5be904728..87c59f785 100644
--- a/tests/gold_tests/cache/background_fill.test.py
+++ b/tests/gold_tests/cache/background_fill.test.py
@@ -47,7 +47,7 @@ class BackgroundFillTest:
def __setupTS(self):
self.ts = Test.MakeATSProcess(
- "ts", select_ports=True, enable_tls=True, enable_cache=True)
+ "ts", enable_tls=True, enable_cache=True)
self.ts.addDefaultSSLFiles()
self.ts.Disk.ssl_multicert_config.AddLine(
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 ac4709186..d52a68bce 100644
--- a/tests/gold_tests/chunked_encoding/bad_chunked_encoding.test.py
+++ b/tests/gold_tests/chunked_encoding/bad_chunked_encoding.test.py
@@ -25,7 +25,7 @@ Test unsupported values for chunked_encoding
Test.ContinueOnFail = True
# Define default ATS
-ts = Test.MakeATSProcess("ts1", select_ports=True, enable_tls=False)
+ts = Test.MakeATSProcess("ts1", enable_tls=False)
server = Test.MakeOriginServer("server")
testName = ""
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
index 62512593e..78410d905 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding.test.py
@@ -30,7 +30,7 @@ Test.ContinueOnFail = True
Test.GetTcpPort("upstream_port")
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
server2 = Test.MakeOriginServer("server2", ssl=True)
server3 = Test.MakeOriginServer("server3")
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 cb0d2f84e..8b9cff786 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
@@ -29,7 +29,7 @@ Test.ContinueOnFail = True
Test.GetTcpPort("upstream_port")
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
# add ssl materials like key, certificates for the server
ts.addDefaultSSLFiles()
diff --git a/tests/gold_tests/connect/connect.test.py b/tests/gold_tests/connect/connect.test.py
index 7a49fe1e4..3552b788a 100644
--- a/tests/gold_tests/connect/connect.test.py
+++ b/tests/gold_tests/connect/connect.test.py
@@ -41,7 +41,7 @@ class ConnectTest:
self.httpbin = Test.MakeHttpBinServer("httpbin")
def __setupTS(self):
- self.ts = Test.MakeATSProcess("ts", select_ports=True)
+ self.ts = Test.MakeATSProcess("ts")
self.ts.Disk.records_config.update({
'proxy.config.diags.debug.enabled': 1,
diff --git a/tests/gold_tests/continuations/double.test.py b/tests/gold_tests/continuations/double.test.py
index ef5875f1a..f150dc990 100644
--- a/tests/gold_tests/continuations/double.test.py
+++ b/tests/gold_tests/continuations/double.test.py
@@ -24,7 +24,7 @@ Test transactions and sessions for http1, making sure the two continuations catc
Test.ContinueOnFail = True
# Define default ATS. Disable the cache to simplify the test.
-ts = Test.MakeATSProcess("ts", select_ports=True, command="traffic_manager", enable_cache=False)
+ts = Test.MakeATSProcess("ts", command="traffic_manager", enable_cache=False)
server = Test.MakeOriginServer("server")
Test.testName = ""
diff --git a/tests/gold_tests/continuations/double_h2.test.py b/tests/gold_tests/continuations/double_h2.test.py
index 97fe02805..179e22cae 100644
--- a/tests/gold_tests/continuations/double_h2.test.py
+++ b/tests/gold_tests/continuations/double_h2.test.py
@@ -26,7 +26,7 @@ Test.SkipUnless(
)
Test.ContinueOnFail = True
# Define default ATS. Disable the cache to simplify the test.
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, command="traffic_manager", enable_cache=False)
+ts = Test.MakeATSProcess("ts", enable_tls=True, command="traffic_manager", enable_cache=False)
server = Test.MakeOriginServer("server")
server2 = Test.MakeOriginServer("server2")
diff --git a/tests/gold_tests/continuations/openclose_h2.test.py b/tests/gold_tests/continuations/openclose_h2.test.py
index add949dd6..8f8e99d9c 100644
--- a/tests/gold_tests/continuations/openclose_h2.test.py
+++ b/tests/gold_tests/continuations/openclose_h2.test.py
@@ -27,7 +27,7 @@ Test.SkipUnless(
)
# Define default ATS. Disable the cache to simplify the test.
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, command="traffic_manager", enable_cache=False)
+ts = Test.MakeATSProcess("ts", enable_tls=True, command="traffic_manager", enable_cache=False)
server = Test.MakeOriginServer("server")
server2 = Test.MakeOriginServer("server2")
diff --git a/tests/gold_tests/dns/dns_ttl.test.py b/tests/gold_tests/dns/dns_ttl.test.py
index 7cfbcafa9..cd0d7ff62 100644
--- a/tests/gold_tests/dns/dns_ttl.test.py
+++ b/tests/gold_tests/dns/dns_ttl.test.py
@@ -68,7 +68,7 @@ class TtlDnsTest:
def setupTS(self):
self.ts = Test.MakeATSProcess(
- f"ts-{self.server_process_counter}", select_ports=True, enable_cache=False)
+ f"ts-{self.server_process_counter}", enable_cache=False)
self.dns_port = ports.get_port(self.ts, 'dns_port')
self.ts.Disk.records_config.update({
"proxy.config.diags.debug.enabled": 1,
diff --git a/tests/gold_tests/dns/splitdns.test.py b/tests/gold_tests/dns/splitdns.test.py
index 23e277cd6..cdbdc8028 100644
--- a/tests/gold_tests/dns/splitdns.test.py
+++ b/tests/gold_tests/dns/splitdns.test.py
@@ -37,7 +37,7 @@ class SplitDNSTest:
def setupTS(self):
self.ts = Test.MakeATSProcess(
- "ts", select_ports=True, enable_cache=False)
+ "ts", enable_cache=False)
self.ts.Disk.records_config.update({
"proxy.config.dns.splitDNS.enabled": 1,
"proxy.config.diags.debug.enabled": 1,
diff --git a/tests/gold_tests/h2/h2disable.test.py b/tests/gold_tests/h2/h2disable.test.py
index 1936807ca..004eedffe 100644
--- a/tests/gold_tests/h2/h2disable.test.py
+++ b/tests/gold_tests/h2/h2disable.test.py
@@ -25,7 +25,7 @@ Test.SkipUnless(
)
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
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 b467dbb9d..8feb8b3fc 100644
--- a/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
+++ b/tests/gold_tests/h2/h2disable_no_accept_threads.test.py
@@ -25,7 +25,7 @@ Test.SkipUnless(
)
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
diff --git a/tests/gold_tests/h2/http2.test.py b/tests/gold_tests/h2/http2.test.py
index 38476191d..11e6fb109 100644
--- a/tests/gold_tests/h2/http2.test.py
+++ b/tests/gold_tests/h2/http2.test.py
@@ -107,7 +107,7 @@ server.addResponse("sessionlog.json",
# ----
# Setup ATS
# ----
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_cache=False)
+ts = Test.MakeATSProcess("ts", enable_tls=True, enable_cache=False)
# add ssl materials like key, certificates for the server
ts.addDefaultSSLFiles()
diff --git a/tests/gold_tests/h2/http2_priority.test.py b/tests/gold_tests/h2/http2_priority.test.py
index f4dc8a38a..6157eeb5e 100644
--- a/tests/gold_tests/h2/http2_priority.test.py
+++ b/tests/gold_tests/h2/http2_priority.test.py
@@ -43,7 +43,7 @@ server.addResponse("sessionlog.json",
# ----
# Setup ATS
# ----
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_cache=False)
+ts = Test.MakeATSProcess("ts", enable_tls=True, enable_cache=False)
ts.addDefaultSSLFiles()
diff --git a/tests/gold_tests/h2/httpbin.test.py b/tests/gold_tests/h2/httpbin.test.py
index 147b6551f..7af2673d4 100644
--- a/tests/gold_tests/h2/httpbin.test.py
+++ b/tests/gold_tests/h2/httpbin.test.py
@@ -40,7 +40,7 @@ httpbin = Test.MakeHttpBinServer("httpbin")
# ----
# Setup ATS
# ----
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_cache=False)
+ts = Test.MakeATSProcess("ts", enable_tls=True, enable_cache=False)
# add ssl materials like key, certificates for the server
ts.addDefaultSSLFiles()
diff --git a/tests/gold_tests/h2/nghttp.test.py b/tests/gold_tests/h2/nghttp.test.py
index d43581e6d..589fdd74c 100644
--- a/tests/gold_tests/h2/nghttp.test.py
+++ b/tests/gold_tests/h2/nghttp.test.py
@@ -40,7 +40,7 @@ post_body_file.close()
# ----
# Setup ATS
# ----
-ts = Test.MakeATSProcess("ts", select_ports=True,
+ts = Test.MakeATSProcess("ts",
enable_tls=True, enable_cache=False)
# add ssl materials like key, certificates for the server
diff --git a/tests/gold_tests/headers/hsts.test.py b/tests/gold_tests/headers/hsts.test.py
index f4777b23f..6af5c9f81 100644
--- a/tests/gold_tests/headers/hsts.test.py
+++ b/tests/gold_tests/headers/hsts.test.py
@@ -24,7 +24,7 @@ heck hsts header is set correctly
Test.ContinueOnFail = True
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
# **testname is required**
diff --git a/tests/gold_tests/headers/normalize_ae.test.py b/tests/gold_tests/headers/normalize_ae.test.py
index a86be2bcb..3d6e93074 100644
--- a/tests/gold_tests/headers/normalize_ae.test.py
+++ b/tests/gold_tests/headers/normalize_ae.test.py
@@ -45,7 +45,7 @@ server.addResponse("sessionlog.json", request_header, response_header)
# Define first ATS. Disable the cache to make sure each request is sent to the
# origin server.
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_cache=False)
+ts = Test.MakeATSProcess("ts", enable_cache=False)
def baselineTsSetup(ts):
@@ -140,7 +140,7 @@ def perTsTest(shouldWaitForUServer, ts):
perTsTest(True, ts)
# Define second ATS
-ts2 = Test.MakeATSProcess("ts2", select_ports=True)
+ts2 = Test.MakeATSProcess("ts2")
baselineTsSetup(ts2)
diff --git a/tests/gold_tests/ip_allow/ip_allow.test.py b/tests/gold_tests/ip_allow/ip_allow.test.py
index 8ec30000c..c1ac9848c 100644
--- a/tests/gold_tests/ip_allow/ip_allow.test.py
+++ b/tests/gold_tests/ip_allow/ip_allow.test.py
@@ -24,7 +24,7 @@ Verify ip_allow filtering behavior.
Test.ContinueOnFail = True
# Define default ATS
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True,
+ts = Test.MakeATSProcess("ts", command="traffic_manager",
enable_tls=True, enable_cache=False)
server = Test.MakeOriginServer("server", ssl=True)
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 40b9c86fe..334479cb0 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
@@ -25,7 +25,7 @@ Test client_context_dump plugin
Test.SkipUnless(Condition.PluginExists('client_context_dump.so'))
# Set up ATS
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager", enable_tls=True)
# Set up ssl files
ts.addSSLfile("ssl/one.com.pem")
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 7061f5eb8..fb3efe388 100644
--- a/tests/gold_tests/pluginTest/lua/lua_states_stats.test.py
+++ b/tests/gold_tests/pluginTest/lua/lua_states_stats.test.py
@@ -28,7 +28,7 @@ Test.ContinueOnFail = True
# Define default ATS
server = Test.MakeOriginServer("server")
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager")
Test.testName = "Lua states and stats"
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 73e4b5010..10fa65d38 100644
--- a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py
+++ b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py
@@ -42,7 +42,7 @@ Test.ContinueOnFail = False
server = Test.MakeOriginServer("server")
# Define ATS and configure
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager")
Test.testName = "regex_revalidate"
Test.Setup.Copy("metrics.sh")
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 d55d17b1a..3d09d95a5 100644
--- a/tests/gold_tests/pluginTest/remap_stats/remap_stats.test.py
+++ b/tests/gold_tests/pluginTest/remap_stats/remap_stats.test.py
@@ -30,7 +30,7 @@ response_header = {"headers": "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n",
"timestamp": "1469733493.993", "body": ""}
server.addResponse("sessionlog.json", request_header, response_header)
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager")
ts.Disk.plugin_config.AddLine('remap_stats.so')
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 93e9e996e..4799974e3 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
@@ -30,7 +30,7 @@ response_header = {"headers": "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n",
"timestamp": "1469733493.993", "body": ""}
server.addResponse("sessionlog.json", request_header, response_header)
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager")
ts.Disk.plugin_config.AddLine('remap_stats.so --post-remap-host')
diff --git a/tests/gold_tests/pluginTest/server_push_preload/server_push_preload.test.py b/tests/gold_tests/pluginTest/server_push_preload/server_push_preload.test.py
index ed08f386d..083d5cb8d 100644
--- a/tests/gold_tests/pluginTest/server_push_preload/server_push_preload.test.py
+++ b/tests/gold_tests/pluginTest/server_push_preload/server_push_preload.test.py
@@ -54,7 +54,7 @@ microserver.addResponse("sessionfile.log",
# ----
# Setup ATS
# ----
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
ts.addDefaultSSLFiles()
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 a39a6dac6..005c0e474 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
@@ -40,7 +40,7 @@ class StatsOverHttpPluginTest:
self.__setupTS()
def __setupTS(self):
- self.ts = Test.MakeATSProcess("ts", select_ports=True)
+ self.ts = Test.MakeATSProcess("ts")
self.ts.Disk.plugin_config.AddLine('stats_over_http.so _stats')
diff --git a/tests/gold_tests/pluginTest/stek_share/stek_share.test.py b/tests/gold_tests/pluginTest/stek_share/stek_share.test.py
index ec0f1b81c..53ac26eff 100644
--- a/tests/gold_tests/pluginTest/stek_share/stek_share.test.py
+++ b/tests/gold_tests/pluginTest/stek_share/stek_share.test.py
@@ -26,11 +26,11 @@ Test.SkipUnless(Condition.PluginExists('stek_share.so'))
server = Test.MakeOriginServer('server')
-ts1 = Test.MakeATSProcess("ts1", select_ports=True, enable_tls=True)
-ts2 = Test.MakeATSProcess("ts2", select_ports=True, enable_tls=True)
-ts3 = Test.MakeATSProcess("ts3", select_ports=True, enable_tls=True)
-ts4 = Test.MakeATSProcess("ts4", select_ports=True, enable_tls=True)
-ts5 = Test.MakeATSProcess("ts5", select_ports=True, enable_tls=True)
+ts1 = Test.MakeATSProcess("ts1", enable_tls=True)
+ts2 = Test.MakeATSProcess("ts2", enable_tls=True)
+ts3 = Test.MakeATSProcess("ts3", enable_tls=True)
+ts4 = Test.MakeATSProcess("ts4", enable_tls=True)
+ts5 = Test.MakeATSProcess("ts5", enable_tls=True)
Test.Setup.Copy('ssl/self_signed.crt')
Test.Setup.Copy('ssl/self_signed.key')
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 3abac58b2..5185ca514 100644
--- a/tests/gold_tests/pluginTest/test_hooks/hook_add.test.py
+++ b/tests/gold_tests/pluginTest/test_hooks/hook_add.test.py
@@ -30,7 +30,7 @@ request_header = {
response_header = {"headers": "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
server.addResponse("sessionlog.json", request_header, response_header)
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=False, enable_cache=False)
+ts = Test.MakeATSProcess("ts", enable_tls=False, enable_cache=False)
ts.Disk.records_config.update({
'proxy.config.diags.debug.tags': 'test',
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 391f80ffa..b4da80090 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
@@ -30,7 +30,7 @@ request_header = {
response_header = {"headers": "HTTP/1.1 200 OK\r\nConnection: close\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
server.addResponse("sessionlog.json", request_header, response_header)
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=False)
+ts = Test.MakeATSProcess("ts", enable_tls=False)
ts.Disk.records_config.update({
'proxy.config.diags.debug.tags': 'test',
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 57541e4ca..acd1926ad 100644
--- a/tests/gold_tests/pluginTest/test_hooks/test_hooks.test.py
+++ b/tests/gold_tests/pluginTest/test_hooks/test_hooks.test.py
@@ -35,7 +35,7 @@ server.addResponse("sessionlog.json", request_header, response_header)
# Disable the cache to make sure each request is forwarded to the origin
# server.
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_cache=False)
+ts = Test.MakeATSProcess("ts", enable_tls=True, enable_cache=False)
# test_hooks.so will output test logging to this file.
log_path = os.path.join(ts.Variables.LOGDIR, "log.txt")
diff --git a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_sni_filter.test.py b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_sni_filter.test.py
index f1eac6bb8..b3222cc67 100644
--- a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_sni_filter.test.py
+++ b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump_sni_filter.test.py
@@ -35,7 +35,7 @@ server = Test.MakeVerifierServerProcess(
ssl_cert="ssl/server_combined.pem", ca_cert="ssl/signer.pem")
# Define ATS and configure
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
replay_dir = os.path.join(ts.RunDirectory, "ts", "log")
ts.addSSLfile("ssl/server.pem")
diff --git a/tests/gold_tests/pluginTest/tsapi/tsapi.test.py b/tests/gold_tests/pluginTest/tsapi/tsapi.test.py
index d4c2d22be..cf79fff09 100644
--- a/tests/gold_tests/pluginTest/tsapi/tsapi.test.py
+++ b/tests/gold_tests/pluginTest/tsapi/tsapi.test.py
@@ -42,7 +42,7 @@ server.addResponse("sessionlog.json", request_header, response_header)
# Disable the cache to make sure each request is forwarded to the origin
# server.
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_cache=False)
+ts = Test.MakeATSProcess("ts", enable_tls=True, enable_cache=False)
# The test plugin will output test logging to this file.
log_file_name = os.path.join(ts.Variables.LOGDIR, "log.txt")
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 a5a429b9a..2a2d27e57 100644
--- a/tests/gold_tests/pluginTest/url_sig/url_sig.test.py
+++ b/tests/gold_tests/pluginTest/url_sig/url_sig.test.py
@@ -45,7 +45,7 @@ server.addResponse("sessionfile.log", request_header, response_header)
# Define default ATS. Disable the cache to make sure each request is forwarded
# to the origin server.
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_cache=False)
+ts = Test.MakeATSProcess("ts", enable_tls=True, enable_cache=False)
ts.addDefaultSSLFiles()
diff --git a/tests/gold_tests/post/post-continue.test.py b/tests/gold_tests/post/post-continue.test.py
index 82fc8f731..6ae979f28 100644
--- a/tests/gold_tests/post/post-continue.test.py
+++ b/tests/gold_tests/post/post-continue.test.py
@@ -38,9 +38,9 @@ httpbin = Test.MakeHttpBinServer("httpbin")
# ----
# Setup ATS
# ----
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_cache=False)
+ts = Test.MakeATSProcess("ts", enable_tls=True, enable_cache=False)
-ts2 = Test.MakeATSProcess("ts2", select_ports=True, enable_tls=True, enable_cache=False)
+ts2 = Test.MakeATSProcess("ts2", enable_tls=True, enable_cache=False)
# add ssl materials like key, certificates for the server
ts.addDefaultSSLFiles()
diff --git a/tests/gold_tests/post/post-early-return.test.py b/tests/gold_tests/post/post-early-return.test.py
index b7beb8a43..af9debbb6 100644
--- a/tests/gold_tests/post/post-early-return.test.py
+++ b/tests/gold_tests/post/post-early-return.test.py
@@ -31,7 +31,7 @@ Test.GetTcpPort("upstream_port")
# ----
# Setup ATS
# ----
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_cache=False)
+ts = Test.MakeATSProcess("ts", enable_tls=True, enable_cache=False)
# add ssl materials like key, certificates for the server
ts.addDefaultSSLFiles()
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 f07d924b2..e9faccbd5 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
@@ -38,7 +38,7 @@ class PostAndMaxRequestsInTest:
)
def __setupTS(self):
- self.ts = Test.MakeATSProcess("ts", select_ports=True)
+ self.ts = Test.MakeATSProcess("ts")
self.ts.Disk.records_config.update({
"proxy.config.http.server_ports": f"{self.ts.Variables.port}",
diff --git a/tests/gold_tests/proxy_protocol/proxy_protocol.test.py b/tests/gold_tests/proxy_protocol/proxy_protocol.test.py
index f2440bfd6..4125ba03c 100644
--- a/tests/gold_tests/proxy_protocol/proxy_protocol.test.py
+++ b/tests/gold_tests/proxy_protocol/proxy_protocol.test.py
@@ -39,7 +39,7 @@ class ProxyProtocolTest:
'''
def setupTS(self):
- self.ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_cache=False)
+ self.ts = Test.MakeATSProcess("ts", enable_tls=True, enable_cache=False)
self.ts.addDefaultSSLFiles()
self.ts.Disk.ssl_multicert_config.AddLine("dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key")
diff --git a/tests/gold_tests/remap/conf_remap_float.test.py b/tests/gold_tests/remap/conf_remap_float.test.py
index 17cc7cf2d..7095d1039 100644
--- a/tests/gold_tests/remap/conf_remap_float.test.py
+++ b/tests/gold_tests/remap/conf_remap_float.test.py
@@ -20,7 +20,7 @@ Test command: traffic_ctl config describe proxy.config.http.background_fill_comp
'''
Test.testName = 'Float in conf_remap Config Test'
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager")
ts.Disk.MakeConfigFile('conf_remap.config').AddLines([
'CONFIG proxy.config.http.background_fill_completed_threshold FLOAT 0.500000'
diff --git a/tests/gold_tests/remap/remap_reload.test.py b/tests/gold_tests/remap/remap_reload.test.py
index 6660dcc58..2f9e0853c 100644
--- a/tests/gold_tests/remap/remap_reload.test.py
+++ b/tests/gold_tests/remap/remap_reload.test.py
@@ -25,7 +25,7 @@ replay_file_2 = "reload_2.replay.yaml"
replay_file_3 = "reload_3.replay.yaml"
replay_file_4 = "reload_4.replay.yaml"
-tm = Test.MakeATSProcess("tm", command="traffic_manager", select_ports=True)
+tm = Test.MakeATSProcess("tm", command="traffic_manager")
tm.Disk.diags_log.Content = Testers.ContainsExpression("remap.config failed to load", "Remap should fail to load")
remap_cfg_path = os.path.join(tm.Variables.CONFIGDIR, 'remap.config')
diff --git a/tests/gold_tests/slow_post/slow_post.test.py b/tests/gold_tests/slow_post/slow_post.test.py
index 1de7ddbfe..b2c4262db 100644
--- a/tests/gold_tests/slow_post/slow_post.test.py
+++ b/tests/gold_tests/slow_post/slow_post.test.py
@@ -47,7 +47,7 @@ class SlowPostAttack:
self._server.addResponse("sessionlog.json", request_header2, response_header2)
def setupTS(self):
- self._ts = Test.MakeATSProcess("ts", select_ports=True)
+ self._ts = Test.MakeATSProcess("ts")
self._ts.Disk.remap_config.AddLine(
'map / http://127.0.0.1:{0}'.format(self._server.Variables.Port)
)
diff --git a/tests/gold_tests/timeout/accept_timeout.test.py b/tests/gold_tests/timeout/accept_timeout.test.py
index 1d513271d..87dbfa9b1 100644
--- a/tests/gold_tests/timeout/accept_timeout.test.py
+++ b/tests/gold_tests/timeout/accept_timeout.test.py
@@ -24,7 +24,7 @@ Test.SkipUnless(
Condition.HasProgram("nc", "Need nc to send data to server")
)
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
ts.addSSLfile("../tls/ssl/server.pem")
ts.addSSLfile("../tls/ssl/server.key")
diff --git a/tests/gold_tests/timeout/active_timeout.test.py b/tests/gold_tests/timeout/active_timeout.test.py
index dcf999816..d487e1492 100644
--- a/tests/gold_tests/timeout/active_timeout.test.py
+++ b/tests/gold_tests/timeout/active_timeout.test.py
@@ -23,9 +23,9 @@ Test.SkipUnless(
)
if Condition.HasATSFeature('TS_USE_QUIC') and Condition.HasCurlFeature('http3'):
- ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True, enable_quic=True)
+ ts = Test.MakeATSProcess("ts", enable_tls=True, enable_quic=True)
else:
- ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server", delay=8)
request_header = {"headers": "GET /file HTTP/1.1\r\nHost: *\r\n\r\n", "timestamp": "5678", "body": ""}
diff --git a/tests/gold_tests/timeout/inactive_client_timeout.test.py b/tests/gold_tests/timeout/inactive_client_timeout.test.py
index f5a84bf8d..e4ff5b940 100644
--- a/tests/gold_tests/timeout/inactive_client_timeout.test.py
+++ b/tests/gold_tests/timeout/inactive_client_timeout.test.py
@@ -18,7 +18,7 @@
Test.Summary = 'Testing ATS client inactivity timeout'
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
replay_file = "slow_server.yaml"
server = Test.MakeVerifierServerProcess("server", replay_file)
diff --git a/tests/gold_tests/timeout/inactive_timeout.test.py b/tests/gold_tests/timeout/inactive_timeout.test.py
index 782f40dab..299bfa7c2 100644
--- a/tests/gold_tests/timeout/inactive_timeout.test.py
+++ b/tests/gold_tests/timeout/inactive_timeout.test.py
@@ -22,7 +22,7 @@ Test.SkipUnless(
Condition.HasCurlFeature('http2')
)
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server", delay=8)
request_header = {"headers": "GET /file HTTP/1.1\r\nHost: *\r\n\r\n", "timestamp": "5678", "body": ""}
diff --git a/tests/gold_tests/tls/ssl_multicert_loader.test.py b/tests/gold_tests/tls/ssl_multicert_loader.test.py
index 6d8b2f5a0..dad0aa17b 100644
--- a/tests/gold_tests/tls/ssl_multicert_loader.test.py
+++ b/tests/gold_tests/tls/ssl_multicert_loader.test.py
@@ -20,7 +20,7 @@ Test reloading ssl_multicert.config with errors and keeping around the old ssl c
sni_domain = 'example.com'
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager", enable_tls=True)
server = Test.MakeOriginServer("server")
server2 = Test.MakeOriginServer("server3")
request_header = {"headers": f"GET / HTTP/1.1\r\nHost: {sni_domain}\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
@@ -95,7 +95,7 @@ tr3.Processes.Default.Streams.stderr = Testers.IncludesExpression(f"CN={sni_doma
# Also, not explicitly setting proxy.config.ssl.server.multicert.exit_on_load_fail
# to catch if the current default (1) changes in the future
-ts2 = Test.MakeATSProcess("ts2", command="traffic_manager", select_ports=True, enable_tls=True)
+ts2 = Test.MakeATSProcess("ts2", command="traffic_manager", enable_tls=True)
ts2.Disk.ssl_multicert_config.AddLines([
'dest_ip=* ssl_cert_name=server.pem_doesnotexist ssl_key_name=server.key',
])
diff --git a/tests/gold_tests/tls/tls.test.py b/tests/gold_tests/tls/tls.test.py
index e9eec50b5..5f6a0b371 100644
--- a/tests/gold_tests/tls/tls.test.py
+++ b/tests/gold_tests/tls/tls.test.py
@@ -23,7 +23,7 @@ Test tls
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
# ssl-post is built via `make`. Here we copy the built binary down to the test
diff --git a/tests/gold_tests/tls/tls_bad_alpn.test.py b/tests/gold_tests/tls/tls_bad_alpn.test.py
index 2bcd2ee52..de80600cc 100644
--- a/tests/gold_tests/tls/tls_bad_alpn.test.py
+++ b/tests/gold_tests/tls/tls_bad_alpn.test.py
@@ -27,7 +27,7 @@ Ensure that handshake fails if invalid alpn string is offered
Test.SkipUnless(Condition.HasOpenSSLVersion('1.1.1'))
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
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 b189060d1..1a798596d 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
@@ -23,7 +23,7 @@ Test ATS offering different certificates based on SNI. Load via plugin
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager", enable_tls=True)
server = Test.MakeOriginServer("server", ssl=True)
dns = Test.MakeDNServer("dns")
diff --git a/tests/gold_tests/tls/tls_check_dual_cert_selection.test.py b/tests/gold_tests/tls/tls_check_dual_cert_selection.test.py
index 7d387390b..3ad49ba43 100644
--- a/tests/gold_tests/tls/tls_check_dual_cert_selection.test.py
+++ b/tests/gold_tests/tls/tls_check_dual_cert_selection.test.py
@@ -24,7 +24,7 @@ Test ATS offering both RSA and EC certificates
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server", ssl=True)
dns = Test.MakeDNServer("dns")
diff --git a/tests/gold_tests/tls/tls_check_dual_cert_selection2.test.py b/tests/gold_tests/tls/tls_check_dual_cert_selection2.test.py
index 394068b7c..e388a9e0c 100644
--- a/tests/gold_tests/tls/tls_check_dual_cert_selection2.test.py
+++ b/tests/gold_tests/tls/tls_check_dual_cert_selection2.test.py
@@ -25,7 +25,7 @@ Combined key and cert files. Faulty key path
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server", ssl=True)
dns = Test.MakeDNServer("dns")
diff --git a/tests/gold_tests/tls/tls_check_dual_cert_selection_plugin.test.py b/tests/gold_tests/tls/tls_check_dual_cert_selection_plugin.test.py
index 0532dbe7c..6bf1fcc73 100644
--- a/tests/gold_tests/tls/tls_check_dual_cert_selection_plugin.test.py
+++ b/tests/gold_tests/tls/tls_check_dual_cert_selection_plugin.test.py
@@ -25,7 +25,7 @@ Test ATS offering both RSA and EC certificates loaded via plugin
Test.SkipUnless(Condition.HasOpenSSLVersion('1.1.1'))
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server", ssl=True)
dns = Test.MakeDNServer("dns")
diff --git a/tests/gold_tests/tls/tls_client_cert.test.py b/tests/gold_tests/tls/tls_client_cert.test.py
index 7a2c5789b..a9086a65d 100644
--- a/tests/gold_tests/tls/tls_client_cert.test.py
+++ b/tests/gold_tests/tls/tls_client_cert.test.py
@@ -21,7 +21,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager")
cafile = "{0}/signer.pem".format(Test.RunDirectory)
cafile2 = "{0}/signer2.pem".format(Test.RunDirectory)
# --clientverify: "" empty string because microserver does store_true for argparse, but options is a dictionary
diff --git a/tests/gold_tests/tls/tls_client_cert2.test.py b/tests/gold_tests/tls/tls_client_cert2.test.py
index 207fdac32..31b981f6d 100644
--- a/tests/gold_tests/tls/tls_client_cert2.test.py
+++ b/tests/gold_tests/tls/tls_client_cert2.test.py
@@ -21,7 +21,7 @@ Test.Summary = '''
Test client certs to origin selected via wildcard names in sni
'''
-ts = Test.MakeATSProcess("ts", command="traffic_server", select_ports=True)
+ts = Test.MakeATSProcess("ts", command="traffic_server")
cafile = "{0}/signer.pem".format(Test.RunDirectory)
cafile2 = "{0}/signer2.pem".format(Test.RunDirectory)
server = Test.MakeOriginServer("server",
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 4410e27c3..a3725445b 100644
--- a/tests/gold_tests/tls/tls_client_cert2_plugin.test.py
+++ b/tests/gold_tests/tls/tls_client_cert2_plugin.test.py
@@ -24,7 +24,7 @@ Test.Summary = '''
Test offering client cert to origin, but using plugin for cert loading
'''
-ts = Test.MakeATSProcess("ts", command="traffic_server", select_ports=True)
+ts = Test.MakeATSProcess("ts", command="traffic_server")
cafile = "{0}/signer.pem".format(Test.RunDirectory)
cafile2 = "{0}/signer2.pem".format(Test.RunDirectory)
server = Test.MakeOriginServer("server",
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 e1fb030d0..ad86f36de 100644
--- a/tests/gold_tests/tls/tls_client_cert_override.test.py
+++ b/tests/gold_tests/tls/tls_client_cert_override.test.py
@@ -21,7 +21,7 @@ Test.Summary = '''
Test conf_remp to specify different client certificates to offer to the origin
'''
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager")
cafile = "{0}/signer.pem".format(Test.RunDirectory)
cafile2 = "{0}/signer2.pem".format(Test.RunDirectory)
server = Test.MakeOriginServer("server",
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 1aa46fa48..db3030a0c 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
@@ -21,7 +21,7 @@ Test conf_remp to specify different client certificates to offer to the origin.
'''
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager")
cafile = "{0}/signer.pem".format(Test.RunDirectory)
cafile2 = "{0}/signer2.pem".format(Test.RunDirectory)
server = Test.MakeOriginServer("server",
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 e493b97a6..95af96731 100644
--- a/tests/gold_tests/tls/tls_client_cert_plugin.test.py
+++ b/tests/gold_tests/tls/tls_client_cert_plugin.test.py
@@ -24,7 +24,7 @@ Test.Summary = '''
Test offering client cert to origin, but using plugin for cert loading
'''
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager")
cafile = "{0}/signer.pem".format(Test.RunDirectory)
cafile2 = "{0}/signer2.pem".format(Test.RunDirectory)
# --clientverify: "" empty string because microserver does store_true for argparse, but options is a dictionary
diff --git a/tests/gold_tests/tls/tls_client_verify.test.py b/tests/gold_tests/tls/tls_client_verify.test.py
index baaf04788..984837f16 100644
--- a/tests/gold_tests/tls/tls_client_verify.test.py
+++ b/tests/gold_tests/tls/tls_client_verify.test.py
@@ -22,7 +22,7 @@ Test.Summary = '''
Test various options for requiring certificate from client for mutual authentication TLS
'''
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager", enable_tls=True)
cafile = "{0}/signer.pem".format(Test.RunDirectory)
cafile2 = "{0}/signer2.pem".format(Test.RunDirectory)
server = Test.MakeOriginServer("server")
diff --git a/tests/gold_tests/tls/tls_client_verify2.test.py b/tests/gold_tests/tls/tls_client_verify2.test.py
index 98f0d2e1f..32042c034 100644
--- a/tests/gold_tests/tls/tls_client_verify2.test.py
+++ b/tests/gold_tests/tls/tls_client_verify2.test.py
@@ -21,7 +21,7 @@ Test.Summary = '''
Test various options for requiring certificate from client for mutual authentication TLS
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
cafile = "{0}/signer.pem".format(Test.RunDirectory)
cafile2 = "{0}/signer2.pem".format(Test.RunDirectory)
server = Test.MakeOriginServer("server")
diff --git a/tests/gold_tests/tls/tls_client_verify3.test.py b/tests/gold_tests/tls/tls_client_verify3.test.py
index 74008f741..d6ab615d2 100644
--- a/tests/gold_tests/tls/tls_client_verify3.test.py
+++ b/tests/gold_tests/tls/tls_client_verify3.test.py
@@ -22,7 +22,7 @@ Test.Summary = '''
Test per SNI server name selection of CA certs for validating cert sent by client.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
diff --git a/tests/gold_tests/tls/tls_client_versions.test.py b/tests/gold_tests/tls/tls_client_versions.test.py
index cd46ec0d8..8d19c7866 100644
--- a/tests/gold_tests/tls/tls_client_versions.test.py
+++ b/tests/gold_tests/tls/tls_client_versions.test.py
@@ -28,7 +28,7 @@ Test.SkipUnless(
)
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server", ssl=True)
request_foo_header = {"headers": "GET / HTTP/1.1\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
diff --git a/tests/gold_tests/tls/tls_engine.test.py b/tests/gold_tests/tls/tls_engine.test.py
index 493ece17c..525ca8c00 100644
--- a/tests/gold_tests/tls/tls_engine.test.py
+++ b/tests/gold_tests/tls/tls_engine.test.py
@@ -33,7 +33,7 @@ Test.SkipUnless(
)
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
# Compile with tsxs. That should bring in the consistent versions of openssl
diff --git a/tests/gold_tests/tls/tls_forward_nonhttp.test.py b/tests/gold_tests/tls/tls_forward_nonhttp.test.py
index d3bd6a8b5..dd5304c4c 100644
--- a/tests/gold_tests/tls/tls_forward_nonhttp.test.py
+++ b/tests/gold_tests/tls/tls_forward_nonhttp.test.py
@@ -24,7 +24,7 @@ Forwarding a non-HTTP protocol out of TLS
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
# add ssl materials like key, certificates for the server
ts.addSSLfile("ssl/server.pem")
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 94838625a..beb996553 100644
--- a/tests/gold_tests/tls/tls_hooks_client_verify.test.py
+++ b/tests/gold_tests/tls/tls_hooks_client_verify.test.py
@@ -25,7 +25,7 @@ Test different combinations of TLS handshake hooks to ensure they are applied co
Test.SkipUnless(Condition.HasOpenSSLVersion("1.1.1"))
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server", ssl=True)
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls/tls_hooks_verify.test.py b/tests/gold_tests/tls/tls_hooks_verify.test.py
index 6d5c39d8a..156d03493 100644
--- a/tests/gold_tests/tls/tls_hooks_verify.test.py
+++ b/tests/gold_tests/tls/tls_hooks_verify.test.py
@@ -23,7 +23,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server", ssl=True)
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls/tls_keepalive.test.py b/tests/gold_tests/tls/tls_keepalive.test.py
index a18d7bba9..7bc742a39 100644
--- a/tests/gold_tests/tls/tls_keepalive.test.py
+++ b/tests/gold_tests/tls/tls_keepalive.test.py
@@ -27,7 +27,7 @@ Test.SkipUnless(
Condition.HasCurlFeature('http2')
)
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls/tls_ocsp.test.py b/tests/gold_tests/tls/tls_ocsp.test.py
index 498c57e23..27e6132f4 100644
--- a/tests/gold_tests/tls/tls_ocsp.test.py
+++ b/tests/gold_tests/tls/tls_ocsp.test.py
@@ -27,7 +27,7 @@ Test.SkipUnless(
)
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
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 6c4a95bf6..289d836f9 100644
--- a/tests/gold_tests/tls/tls_origin_session_reuse.test.py
+++ b/tests/gold_tests/tls/tls_origin_session_reuse.test.py
@@ -22,10 +22,10 @@ Test tls origin session reuse
'''
# Define default ATS
-ts1 = Test.MakeATSProcess("ts1", select_ports=True, enable_tls=True)
-ts2 = Test.MakeATSProcess("ts2", select_ports=True, enable_tls=True)
-ts3 = Test.MakeATSProcess("ts3", select_ports=True, enable_tls=True)
-ts4 = Test.MakeATSProcess("ts4", select_ports=True, enable_tls=True)
+ts1 = Test.MakeATSProcess("ts1", enable_tls=True)
+ts2 = Test.MakeATSProcess("ts2", enable_tls=True)
+ts3 = Test.MakeATSProcess("ts3", enable_tls=True)
+ts4 = Test.MakeATSProcess("ts4", enable_tls=True)
server = Test.MakeOriginServer("server")
# Add info the origin server responses
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 1e3ad41cc..021eae888 100644
--- a/tests/gold_tests/tls/tls_partial_blind_tunnel.test.py
+++ b/tests/gold_tests/tls/tls_partial_blind_tunnel.test.py
@@ -18,7 +18,7 @@
Test.Summary = 'Testing partial_blind_tunnel'
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server_bar = Test.MakeOriginServer("server_bar", ssl=True)
nameserver = Test.MakeDNServer("dns", default='127.0.0.1')
diff --git a/tests/gold_tests/tls/tls_session_reuse.test.py b/tests/gold_tests/tls/tls_session_reuse.test.py
index 41791dc07..5e2b931f9 100644
--- a/tests/gold_tests/tls/tls_session_reuse.test.py
+++ b/tests/gold_tests/tls/tls_session_reuse.test.py
@@ -24,9 +24,9 @@ Test tls session reuse
'''
# Define default ATS
-ts1 = Test.MakeATSProcess("ts1", select_ports=True, enable_tls=True)
-ts2 = Test.MakeATSProcess("ts2", select_ports=True, enable_tls=True)
-ts3 = Test.MakeATSProcess("ts3", select_ports=True, enable_tls=True)
+ts1 = Test.MakeATSProcess("ts1", enable_tls=True)
+ts2 = Test.MakeATSProcess("ts2", enable_tls=True)
+ts3 = Test.MakeATSProcess("ts3", enable_tls=True)
server = Test.MakeOriginServer("server")
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 1b6e6847c..99e38e70f 100644
--- a/tests/gold_tests/tls/tls_sni_host_policy.test.py
+++ b/tests/gold_tests/tls/tls_sni_host_policy.test.py
@@ -24,7 +24,7 @@ Test.Summary = '''
Test exercising host and SNI mismatch controls
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
cafile = "{0}/signer.pem".format(Test.RunDirectory)
cafile2 = "{0}/signer2.pem".format(Test.RunDirectory)
server = Test.MakeOriginServer("server")
diff --git a/tests/gold_tests/tls/tls_ticket.test.py b/tests/gold_tests/tls/tls_ticket.test.py
index 2af6bbef0..ee704423c 100644
--- a/tests/gold_tests/tls/tls_ticket.test.py
+++ b/tests/gold_tests/tls/tls_ticket.test.py
@@ -22,8 +22,8 @@ Test tls tickets
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
-ts2 = Test.MakeATSProcess("ts2", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
+ts2 = Test.MakeATSProcess("ts2", enable_tls=True)
server = Test.MakeOriginServer("server")
diff --git a/tests/gold_tests/tls/tls_tunnel.test.py b/tests/gold_tests/tls/tls_tunnel.test.py
index bcf7cc946..f35f554a0 100644
--- a/tests/gold_tests/tls/tls_tunnel.test.py
+++ b/tests/gold_tests/tls/tls_tunnel.test.py
@@ -21,7 +21,7 @@ Test tunneling based on SNI
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", command="traffic_manager", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", command="traffic_manager", enable_tls=True)
server_foo = Test.MakeOriginServer("server_foo", ssl=True)
server_bar = Test.MakeOriginServer("server_bar", ssl=True)
server2 = Test.MakeOriginServer("server2")
diff --git a/tests/gold_tests/tls/tls_tunnel_forward.test.py b/tests/gold_tests/tls/tls_tunnel_forward.test.py
index e7c791a93..d82b92a07 100644
--- a/tests/gold_tests/tls/tls_tunnel_forward.test.py
+++ b/tests/gold_tests/tls/tls_tunnel_forward.test.py
@@ -21,7 +21,7 @@ Test tunneling and forwarding based on SNI
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server_foo = Test.MakeOriginServer("server_foo", ssl=True)
server_bar = Test.MakeOriginServer("server_bar", ssl=False)
server_random = Test.MakeOriginServer("server_random", ssl=False)
diff --git a/tests/gold_tests/tls/tls_verify.test.py b/tests/gold_tests/tls/tls_verify.test.py
index be23bc7ed..3eb2803a4 100644
--- a/tests/gold_tests/tls/tls_verify.test.py
+++ b/tests/gold_tests/tls/tls_verify.test.py
@@ -21,7 +21,7 @@ Test tls server certificate verification options
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server_foo = Test.MakeOriginServer("server_foo",
ssl=True,
options={"--key": "{0}/signed-foo.key".format(Test.RunDirectory),
diff --git a/tests/gold_tests/tls/tls_verify2.test.py b/tests/gold_tests/tls/tls_verify2.test.py
index f95f01ebe..1e2314243 100644
--- a/tests/gold_tests/tls/tls_verify2.test.py
+++ b/tests/gold_tests/tls/tls_verify2.test.py
@@ -21,7 +21,7 @@ Test tls server certificate verification options
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server_foo = Test.MakeOriginServer("server_foo",
ssl=True,
options={"--key": "{0}/signed-foo.key".format(Test.RunDirectory),
diff --git a/tests/gold_tests/tls/tls_verify3.test.py b/tests/gold_tests/tls/tls_verify3.test.py
index 12cc7e373..560ae2d42 100644
--- a/tests/gold_tests/tls/tls_verify3.test.py
+++ b/tests/gold_tests/tls/tls_verify3.test.py
@@ -21,7 +21,7 @@ Test tls server certificate verification options
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server_foo = Test.MakeOriginServer("server_foo",
ssl=True,
options={"--key": "{0}/signed-foo.key".format(Test.RunDirectory),
diff --git a/tests/gold_tests/tls/tls_verify_base.test.py b/tests/gold_tests/tls/tls_verify_base.test.py
index bcb031837..d43415eb7 100644
--- a/tests/gold_tests/tls/tls_verify_base.test.py
+++ b/tests/gold_tests/tls/tls_verify_base.test.py
@@ -21,7 +21,7 @@ Test tls server certificate verification options
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server_foo = Test.MakeOriginServer("server_foo",
ssl=True,
options={"--key": "{0}/signed-foo.key".format(Test.RunDirectory),
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 b85860feb..8b5517091 100644
--- a/tests/gold_tests/tls/tls_verify_ca_override.test.py
+++ b/tests/gold_tests/tls/tls_verify_ca_override.test.py
@@ -21,7 +21,7 @@ Test tls server certificate verification options. Exercise conf_remap for ca bu
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True)
+ts = Test.MakeATSProcess("ts")
server1 = Test.MakeOriginServer("server1",
ssl=True,
options={"--key": "{0}/signed-foo.key".format(Test.RunDirectory),
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 14bb86ede..b2078caa2 100644
--- a/tests/gold_tests/tls/tls_verify_not_pristine.test.py
+++ b/tests/gold_tests/tls/tls_verify_not_pristine.test.py
@@ -21,7 +21,7 @@ Test tls server certificate verification without a pristine host header
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server_foo = Test.MakeOriginServer("server_foo",
ssl=True,
options={"--key": "{0}/signed-foo.key".format(Test.RunDirectory),
diff --git a/tests/gold_tests/tls/tls_verify_override.test.py b/tests/gold_tests/tls/tls_verify_override.test.py
index 8e906d385..7989d3055 100644
--- a/tests/gold_tests/tls/tls_verify_override.test.py
+++ b/tests/gold_tests/tls/tls_verify_override.test.py
@@ -21,7 +21,7 @@ Test tls server certificate verification options. Exercise conf_remap
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True)
+ts = Test.MakeATSProcess("ts")
server_foo = Test.MakeOriginServer("server_foo",
ssl=True,
options={"--key": "{0}/signed-foo.key".format(Test.RunDirectory),
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 00027f230..3ccf55360 100644
--- a/tests/gold_tests/tls/tls_verify_override_base.test.py
+++ b/tests/gold_tests/tls/tls_verify_override_base.test.py
@@ -21,7 +21,7 @@ Test tls server certificate verification options. Exercise conf_remap
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server_foo = Test.MakeOriginServer("server_foo",
ssl=True,
options={"--key": "{0}/signed-foo.key".format(Test.RunDirectory),
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 bb6ec92c3..324d9c416 100644
--- a/tests/gold_tests/tls/tls_verify_override_sni.test.py
+++ b/tests/gold_tests/tls/tls_verify_override_sni.test.py
@@ -21,7 +21,7 @@ Test tls server certificate verification options. Exercise conf_remap
'''
# Define default ATS
-ts = Test.MakeATSProcess("ts", select_ports=True)
+ts = Test.MakeATSProcess("ts")
cafile = "{0}/signer.pem".format(Test.RunDirectory)
server_foo = Test.MakeOriginServer("server_foo",
diff --git a/tests/gold_tests/tls_hooks/tls_hooks.test.py b/tests/gold_tests/tls_hooks/tls_hooks.test.py
index 72c08bd67..38f11f9d8 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks.test.py
@@ -24,7 +24,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks10.test.py b/tests/gold_tests/tls_hooks/tls_hooks10.test.py
index 866424019..7bdd6c5b3 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks10.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks10.test.py
@@ -23,7 +23,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks11.test.py b/tests/gold_tests/tls_hooks/tls_hooks11.test.py
index 1edf8d6a9..596d8b95e 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks11.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks11.test.py
@@ -24,7 +24,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks12.test.py b/tests/gold_tests/tls_hooks/tls_hooks12.test.py
index 13b2a432d..2cdf6bb42 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks12.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks12.test.py
@@ -23,7 +23,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks13.test.py b/tests/gold_tests/tls_hooks/tls_hooks13.test.py
index cf72317e1..c3d2ef761 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks13.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks13.test.py
@@ -23,7 +23,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server", ssl=True)
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks14.test.py b/tests/gold_tests/tls_hooks/tls_hooks14.test.py
index 224069d24..446a861cb 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks14.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks14.test.py
@@ -23,7 +23,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server", ssl=True)
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks15.test.py b/tests/gold_tests/tls_hooks/tls_hooks15.test.py
index ba4740063..55fdb1ea4 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks15.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks15.test.py
@@ -23,7 +23,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server", ssl=True)
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks16.test.py b/tests/gold_tests/tls_hooks/tls_hooks16.test.py
index 84b96c68d..61c752cef 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks16.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks16.test.py
@@ -28,7 +28,7 @@ Test.SkipUnless(
Condition.HasOpenSSLVersion("1.1.1")
)
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks17.test.py b/tests/gold_tests/tls_hooks/tls_hooks17.test.py
index 4d78a00c6..b2aea9954 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks17.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks17.test.py
@@ -29,7 +29,7 @@ Test.SkipUnless(
Condition.IsOpenSSL()
)
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks18.test.py b/tests/gold_tests/tls_hooks/tls_hooks18.test.py
index b4c028d79..5c4fc45c7 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks18.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks18.test.py
@@ -29,7 +29,7 @@ Test.SkipUnless(
Condition.IsOpenSSL()
)
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks2.test.py b/tests/gold_tests/tls_hooks/tls_hooks2.test.py
index 19a5c9f2d..24a34e088 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks2.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks2.test.py
@@ -24,7 +24,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks3.test.py b/tests/gold_tests/tls_hooks/tls_hooks3.test.py
index 9a39c4b31..69e50fae3 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks3.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks3.test.py
@@ -24,7 +24,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks4.test.py b/tests/gold_tests/tls_hooks/tls_hooks4.test.py
index 085b870b0..922ad679b 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks4.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks4.test.py
@@ -24,7 +24,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks6.test.py b/tests/gold_tests/tls_hooks/tls_hooks6.test.py
index 85038bdff..8dece2658 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks6.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks6.test.py
@@ -24,7 +24,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks7.test.py b/tests/gold_tests/tls_hooks/tls_hooks7.test.py
index 477aa256e..5aa020197 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks7.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks7.test.py
@@ -24,7 +24,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks8.test.py b/tests/gold_tests/tls_hooks/tls_hooks8.test.py
index a3c101c97..3b337606f 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks8.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks8.test.py
@@ -24,7 +24,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server
diff --git a/tests/gold_tests/tls_hooks/tls_hooks9.test.py b/tests/gold_tests/tls_hooks/tls_hooks9.test.py
index b934f29f5..4001e02bd 100644
--- a/tests/gold_tests/tls_hooks/tls_hooks9.test.py
+++ b/tests/gold_tests/tls_hooks/tls_hooks9.test.py
@@ -24,7 +24,7 @@ Test.Summary = '''
Test different combinations of TLS handshake hooks to ensure they are applied consistently.
'''
-ts = Test.MakeATSProcess("ts", select_ports=True, enable_tls=True)
+ts = Test.MakeATSProcess("ts", enable_tls=True)
server = Test.MakeOriginServer("server")
request_header = {"headers": "GET / HTTP/1.1\r\nHost: www.example.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
# desired response form the origin server