This is an automated email from the ASF dual-hosted git repository.
shinrich 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 11c3f8d82c Adjust ReturnCode for MakeATSProcess on ubuntu22 (#10904)
11c3f8d82c is described below
commit 11c3f8d82c52203da82d1442ed9d2228cc3e6c21
Author: Susan Hinrichs <[email protected]>
AuthorDate: Tue Dec 12 10:15:50 2023 -0600
Adjust ReturnCode for MakeATSProcess on ubuntu22 (#10904)
---
tests/gold_tests/next_hop/strategies_ch/strategies_ch.test.py | 1 +
tests/gold_tests/next_hop/strategies_ch2/strategies_ch2.test.py | 1 +
tests/gold_tests/next_hop/strategies_stale/strategies_stale.test.py | 1 +
.../gold_tests/next_hop/zzz_strategies_peer/zzz_strategies_peer.test.py | 1 +
.../next_hop/zzz_strategies_peer2/zzz_strategies_peer2.test.py | 1 +
tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py | 1 +
tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py | 1 +
tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py | 1 +
8 files changed, 8 insertions(+)
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 29f67ec417..d8d48bf704 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
@@ -59,6 +59,7 @@ for i in range(num_nh):
'proxy.config.dns.resolv_conf': "NULL",
})
ts.Disk.remap_config.AddLine(f"map /
http://127.0.0.1:{server.Variables.Port}";)
+ ts.ReturnCode = Any(0, -2)
ts_nh.append(ts)
ts = Test.MakeATSProcess("ts")
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 08331fc64d..1dde7079db 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
@@ -62,6 +62,7 @@ for i in range(num_nh):
ts_nh.append(ts)
ts = Test.MakeATSProcess("ts", use_traffic_out=False, command="traffic_server
2> trace.log")
+ts.ReturnCode = Any(0, -2)
ts.Disk.records_config.update(
{
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 10ed23c6d0..582bb6bdcc 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
@@ -55,6 +55,7 @@ ts_nh.Disk.records_config.update(
'proxy.config.dns.resolv_conf': "NULL",
})
ts_nh.Disk.remap_config.AddLine(f"map /
http://127.0.0.1:{server.Variables.Port}";)
+ts_nh.ReturnCode = Any(0, -2)
ts = Test.MakeATSProcess("ts")
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 f5f977301c..13b4cea6fe 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
@@ -71,6 +71,7 @@ num_peer = 8
ts_peer = []
for i in range(num_peer):
ts = Test.MakeATSProcess(f"ts_peer{i}", use_traffic_out=False,
command=f"traffic_server 2> trace_peer{i}.log")
+ ts.ReturnCode = Any(0, -2)
ts_peer.append(ts)
for i in range(num_peer):
ts = ts_peer[i]
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 adaea1b389..9d28939005 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
@@ -71,6 +71,7 @@ num_peer = 8
ts_peer = []
for i in range(num_peer):
ts = Test.MakeATSProcess(f"ts_peer{i}", use_traffic_out=False,
command=f"traffic_server 2> trace_peer{i}.log")
+ ts.ReturnCode = Any(0, -2)
ts_peer.append(ts)
for i in range(num_peer):
ts = ts_peer[i]
diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py
b/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py
index 198f71f644..698a79edc4 100644
--- a/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py
+++ b/tests/gold_tests/pluginTest/prefetch/prefetch_bignum.test.py
@@ -57,6 +57,7 @@ ts.Disk.remap_config.AddLine(
f"map http://domain.in http://127.0.0.1:{server.Variables.Port}"; + "
@plugin=cachekey.so @pparam=--remove-all-params=true"
" @plugin=prefetch.so" + " @pparam=--front=true" + "
@pparam=--fetch-policy=simple" +
r" @pparam=--fetch-path-pattern=/(.*-)(\d+)(.*)/$1{$2+1}$3/" + "
@pparam=--fetch-count=3" + " @pparam=--fetch-overflow=bignum")
+ts.ReturnCode = Any(0, -2)
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server)
diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py
b/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py
index 1de1045b6e..a41cb3d595 100644
--- a/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py
+++ b/tests/gold_tests/pluginTest/prefetch/prefetch_overflow.test.py
@@ -54,6 +54,7 @@ ts.Disk.remap_config.AddLine(
f"map http://domain.in http://127.0.0.1:{server.Variables.Port}"; + "
@plugin=cachekey.so @pparam=--remove-all-params=true"
" @plugin=prefetch.so" + " @pparam=--front=true" + "
@pparam=--fetch-policy=simple" +
r" @pparam=--fetch-path-pattern=/(.*-)(\d+)(.*)/$1{$2+1}$3/" + "
@pparam=--fetch-count=3" + " @pparam=--fetch-overflow=64")
+ts.ReturnCode = Any(0, -2)
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server)
diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py
b/tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py
index 1ae8b14339..9c5a291540 100644
--- a/tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py
+++ b/tests/gold_tests/pluginTest/prefetch/prefetch_simple.test.py
@@ -54,6 +54,7 @@ ts.Disk.remap_config.AddLine(
f"map http://domain.in http://127.0.0.1:{server.Variables.Port}"; + "
@plugin=cachekey.so @pparam=--remove-all-params=true"
" @plugin=prefetch.so" + " @pparam=--front=true" + "
@pparam=--fetch-policy=simple" +
r" @pparam=--fetch-path-pattern=/(.*-)(\d+)(.*)/$1{$2+1}$3/" + "
@pparam=--fetch-count=3")
+ts.ReturnCode = Any(0, -2)
tr = Test.AddTestRun()
tr.Processes.Default.StartBefore(server)
