This is an automated email from the ASF dual-hosted git repository.
duke8253 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 4d0f7c9fcb help autest to run on ubuntu (#10936)
4d0f7c9fcb is described below
commit 4d0f7c9fcbc36dbf481bac3c1eedad6c0f9a5c36
Author: Fei Deng <[email protected]>
AuthorDate: Mon Apr 29 14:30:28 2024 -0500
help autest to run on ubuntu (#10936)
---
tests/gold_tests/cache/background_fill.test.py | 18 ++++++++++--------
...l_0_stderr.gold => background_fill_0_stderr_H.gold} | 4 +---
...l_0_stderr.gold => background_fill_0_stderr_W.gold} | 8 ++------
...l_1_stderr.gold => background_fill_1_stderr_H.gold} | 6 ++----
...l_0_stderr.gold => background_fill_1_stderr_W.gold} | 8 ++------
...l_2_stderr.gold => background_fill_2_stderr_H.gold} | 4 +---
...l_2_stderr.gold => background_fill_2_stderr_W.gold} | 8 ++------
7 files changed, 20 insertions(+), 36 deletions(-)
diff --git a/tests/gold_tests/cache/background_fill.test.py
b/tests/gold_tests/cache/background_fill.test.py
index ea0f307925..2258cab627 100644
--- a/tests/gold_tests/cache/background_fill.test.py
+++ b/tests/gold_tests/cache/background_fill.test.py
@@ -17,7 +17,6 @@
# limitations under the License.
from enum import Enum
-import os
Test.Summary = 'Exercise Background Fill'
Test.SkipUnless(Condition.HasCurlFeature('http2'),
Condition.HasProxyVerifierVersion('2.8.0'))
@@ -114,7 +113,8 @@ sleep 4;
curl --http1.1 -vs
http://127.0.0.1:{self.ts['for_httpbin'].Variables.port}/drip?duration=4
"""
tr.Processes.Default.ReturnCode = 0
- tr.Processes.Default.Streams.stderr =
"gold/background_fill_0_stderr.gold"
+ tr.Processes.Default.Streams.stderr = Testers.Any(
+ "gold/background_fill_0_stderr_H.gold",
"gold/background_fill_0_stderr_W.gold")
self.__checkProcessAfter(tr)
def __testCase1(self):
@@ -125,12 +125,13 @@ curl --http1.1 -vs
http://127.0.0.1:{self.ts['for_httpbin'].Variables.port}/drip
self.__checkProcessBefore(tr)
tr.Processes.Default.Command = f"""
curl -X PURGE --http1.1 -vsk
https://127.0.0.1:{self.ts['for_httpbin'].Variables.ssl_port}/drip?duration=4;
-timeout 2 curl --http1.1 -vsk
https://127.0.0.1:{self.ts['for_httpbin'].Variables.ssl_port}/drip?duration=4;
-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
"""
tr.Processes.Default.ReturnCode = 0
- tr.Processes.Default.Streams.stderr =
"gold/background_fill_1_stderr.gold"
+ tr.Processes.Default.Streams.stderr = Testers.Any(
+ "gold/background_fill_1_stderr_H.gold",
"gold/background_fill_1_stderr_W.gold")
self.__checkProcessAfter(tr)
def __testCase2(self):
@@ -141,12 +142,13 @@ curl --http1.1 -vsk
https://127.0.0.1:{self.ts['for_httpbin'].Variables.ssl_port
self.__checkProcessBefore(tr)
tr.Processes.Default.Command = f"""
curl -X PURGE --http2 -vsk
https://127.0.0.1:{self.ts['for_httpbin'].Variables.ssl_port}/drip?duration=4;
-timeout 2 curl --http2 -vsk
https://127.0.0.1:{self.ts['for_httpbin'].Variables.ssl_port}/drip?duration=4;
-sleep 4;
+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
"""
tr.Processes.Default.ReturnCode = 0
- tr.Processes.Default.Streams.stderr =
"gold/background_fill_2_stderr.gold"
+ tr.Processes.Default.Streams.stderr = Testers.Any(
+ "gold/background_fill_2_stderr_H.gold",
"gold/background_fill_2_stderr_W.gold")
self.__checkProcessAfter(tr)
def __testCase3(self):
diff --git a/tests/gold_tests/cache/gold/background_fill_0_stderr.gold
b/tests/gold_tests/cache/gold/background_fill_0_stderr_H.gold
similarity index 89%
copy from tests/gold_tests/cache/gold/background_fill_0_stderr.gold
copy to tests/gold_tests/cache/gold/background_fill_0_stderr_H.gold
index aa205297c1..6c9b90e886 100644
--- a/tests/gold_tests/cache/gold/background_fill_0_stderr.gold
+++ b/tests/gold_tests/cache/gold/background_fill_0_stderr_H.gold
@@ -7,13 +7,11 @@
``
> GET /drip?duration=4 HTTP/1.1
``
-< HTTP/1.1 200 OK
-``
< Via: http/1.1 traffic_server (ApacheTrafficServer/`` [cMsSfW])
``
> GET /drip?duration=4 HTTP/1.1
``
-< HTTP/1.1 200 OK
+< HTTP/1.1 ``
``
< Via: http/1.1 traffic_server (ApacheTrafficServer/`` [cHs f ])
``
diff --git a/tests/gold_tests/cache/gold/background_fill_0_stderr.gold
b/tests/gold_tests/cache/gold/background_fill_0_stderr_W.gold
similarity index 53%
copy from tests/gold_tests/cache/gold/background_fill_0_stderr.gold
copy to tests/gold_tests/cache/gold/background_fill_0_stderr_W.gold
index aa205297c1..383c9c7364 100644
--- a/tests/gold_tests/cache/gold/background_fill_0_stderr.gold
+++ b/tests/gold_tests/cache/gold/background_fill_0_stderr_W.gold
@@ -7,13 +7,9 @@
``
> GET /drip?duration=4 HTTP/1.1
``
-< HTTP/1.1 200 OK
-``
-< Via: http/1.1 traffic_server (ApacheTrafficServer/`` [cMsSfW])
-``
> GET /drip?duration=4 HTTP/1.1
``
-< HTTP/1.1 200 OK
+< HTTP/1.1 ``
``
-< Via: http/1.1 traffic_server (ApacheTrafficServer/`` [cHs f ])
+< Via: http/1.1 traffic_server (ApacheTrafficServer/`` [cWs f ])
``
diff --git a/tests/gold_tests/cache/gold/background_fill_1_stderr.gold
b/tests/gold_tests/cache/gold/background_fill_1_stderr_H.gold
similarity index 71%
rename from tests/gold_tests/cache/gold/background_fill_1_stderr.gold
rename to tests/gold_tests/cache/gold/background_fill_1_stderr_H.gold
index aa205297c1..a3e0e168b7 100644
--- a/tests/gold_tests/cache/gold/background_fill_1_stderr.gold
+++ b/tests/gold_tests/cache/gold/background_fill_1_stderr_H.gold
@@ -7,13 +7,11 @@
``
> GET /drip?duration=4 HTTP/1.1
``
-< HTTP/1.1 200 OK
-``
-< Via: http/1.1 traffic_server (ApacheTrafficServer/`` [cMsSfW])
+< Via: http/1.1 traffic_server (ApacheTrafficServer/10.0.0 [cMsSfW])
``
> GET /drip?duration=4 HTTP/1.1
``
-< HTTP/1.1 200 OK
+< HTTP/1.1 ``
``
< Via: http/1.1 traffic_server (ApacheTrafficServer/`` [cHs f ])
``
diff --git a/tests/gold_tests/cache/gold/background_fill_0_stderr.gold
b/tests/gold_tests/cache/gold/background_fill_1_stderr_W.gold
similarity index 53%
rename from tests/gold_tests/cache/gold/background_fill_0_stderr.gold
rename to tests/gold_tests/cache/gold/background_fill_1_stderr_W.gold
index aa205297c1..383c9c7364 100644
--- a/tests/gold_tests/cache/gold/background_fill_0_stderr.gold
+++ b/tests/gold_tests/cache/gold/background_fill_1_stderr_W.gold
@@ -7,13 +7,9 @@
``
> GET /drip?duration=4 HTTP/1.1
``
-< HTTP/1.1 200 OK
-``
-< Via: http/1.1 traffic_server (ApacheTrafficServer/`` [cMsSfW])
-``
> GET /drip?duration=4 HTTP/1.1
``
-< HTTP/1.1 200 OK
+< HTTP/1.1 ``
``
-< Via: http/1.1 traffic_server (ApacheTrafficServer/`` [cHs f ])
+< Via: http/1.1 traffic_server (ApacheTrafficServer/`` [cWs f ])
``
diff --git a/tests/gold_tests/cache/gold/background_fill_2_stderr.gold
b/tests/gold_tests/cache/gold/background_fill_2_stderr_H.gold
similarity index 90%
copy from tests/gold_tests/cache/gold/background_fill_2_stderr.gold
copy to tests/gold_tests/cache/gold/background_fill_2_stderr_H.gold
index d71ba6c834..ed4459477b 100644
--- a/tests/gold_tests/cache/gold/background_fill_2_stderr.gold
+++ b/tests/gold_tests/cache/gold/background_fill_2_stderr_H.gold
@@ -7,13 +7,11 @@
``
> GET /drip?duration=4 HTTP/2
``
-< HTTP/2 200 ``
-``
< via: http/1.1 traffic_server (ApacheTrafficServer/`` [cMsSfW])
``
> GET /drip?duration=4 HTTP/2
``
-< HTTP/2 200 ``
+< HTTP/2 ``
``
< via: http/1.1 traffic_server (ApacheTrafficServer/`` [cHs f ])
``
diff --git a/tests/gold_tests/cache/gold/background_fill_2_stderr.gold
b/tests/gold_tests/cache/gold/background_fill_2_stderr_W.gold
similarity index 52%
rename from tests/gold_tests/cache/gold/background_fill_2_stderr.gold
rename to tests/gold_tests/cache/gold/background_fill_2_stderr_W.gold
index d71ba6c834..bff1dbb288 100644
--- a/tests/gold_tests/cache/gold/background_fill_2_stderr.gold
+++ b/tests/gold_tests/cache/gold/background_fill_2_stderr_W.gold
@@ -7,13 +7,9 @@
``
> GET /drip?duration=4 HTTP/2
``
-< HTTP/2 200 ``
-``
-< via: http/1.1 traffic_server (ApacheTrafficServer/`` [cMsSfW])
-``
> GET /drip?duration=4 HTTP/2
``
-< HTTP/2 200 ``
+< HTTP/2 ``
``
-< via: http/1.1 traffic_server (ApacheTrafficServer/`` [cHs f ])
+< via: http/1.1 traffic_server (ApacheTrafficServer/`` [cWs f ])
``
