From 06c01972ac3db8d8ef8a6f04379028c6eebeff92 Mon Sep 17 00:00:00 2001 From: Fei Deng Date: Mon, 11 Dec 2023 16:33:10 -0500 Subject: [PATCH] help autest to run on ubuntu --- tests/gold_tests/cache/background_fill.test.py | 18 ++++++++++-------- ...rr.gold => background_fill_0_stderr_H.gold} | 4 +--- .../cache/gold/background_fill_0_stderr_W.gold | 15 +++++++++++++++ ...rr.gold => background_fill_1_stderr_H.gold} | 6 ++---- .../cache/gold/background_fill_1_stderr_W.gold | 15 +++++++++++++++ ...rr.gold => background_fill_2_stderr_H.gold} | 4 +--- .../cache/gold/background_fill_2_stderr_W.gold | 15 +++++++++++++++ 7 files changed, 59 insertions(+), 18 deletions(-) rename tests/gold_tests/cache/gold/{background_fill_0_stderr.gold => background_fill_0_stderr_H.gold} (89%) create mode 100644 tests/gold_tests/cache/gold/background_fill_0_stderr_W.gold rename tests/gold_tests/cache/gold/{background_fill_1_stderr.gold => background_fill_1_stderr_H.gold} (71%) create mode 100644 tests/gold_tests/cache/gold/background_fill_1_stderr_W.gold rename tests/gold_tests/cache/gold/{background_fill_2_stderr.gold => background_fill_2_stderr_H.gold} (90%) create mode 100644 tests/gold_tests/cache/gold/background_fill_2_stderr_W.gold diff --git a/tests/gold_tests/cache/background_fill.test.py b/tests/gold_tests/cache/background_fill.test.py index ea0f307925b..2258cab627d 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 @@ def __testCase0(self): 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 @@ def __testCase1(self): 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 @@ def __testCase2(self): 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% rename from tests/gold_tests/cache/gold/background_fill_0_stderr.gold rename to tests/gold_tests/cache/gold/background_fill_0_stderr_H.gold index aa205297c19..6c9b90e886d 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_W.gold b/tests/gold_tests/cache/gold/background_fill_0_stderr_W.gold new file mode 100644 index 00000000000..383c9c73647 --- /dev/null +++ b/tests/gold_tests/cache/gold/background_fill_0_stderr_W.gold @@ -0,0 +1,15 @@ +`` +> PURGE /drip?duration=4 HTTP/1.1 +`` +< HTTP/1.1 `` +`` +< Via: http/1.1 traffic_server (ApacheTrafficServer/``) +`` +> GET /drip?duration=4 HTTP/1.1 +`` +> GET /drip?duration=4 HTTP/1.1 +`` +< HTTP/1.1 `` +`` +< 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 aa205297c19..a3e0e168b79 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_1_stderr_W.gold b/tests/gold_tests/cache/gold/background_fill_1_stderr_W.gold new file mode 100644 index 00000000000..383c9c73647 --- /dev/null +++ b/tests/gold_tests/cache/gold/background_fill_1_stderr_W.gold @@ -0,0 +1,15 @@ +`` +> PURGE /drip?duration=4 HTTP/1.1 +`` +< HTTP/1.1 `` +`` +< Via: http/1.1 traffic_server (ApacheTrafficServer/``) +`` +> GET /drip?duration=4 HTTP/1.1 +`` +> GET /drip?duration=4 HTTP/1.1 +`` +< HTTP/1.1 `` +`` +< 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% rename from tests/gold_tests/cache/gold/background_fill_2_stderr.gold rename to tests/gold_tests/cache/gold/background_fill_2_stderr_H.gold index d71ba6c834d..ed4459477bb 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_W.gold b/tests/gold_tests/cache/gold/background_fill_2_stderr_W.gold new file mode 100644 index 00000000000..bff1dbb288d --- /dev/null +++ b/tests/gold_tests/cache/gold/background_fill_2_stderr_W.gold @@ -0,0 +1,15 @@ +`` +> PURGE /drip?duration=4 HTTP/2 +`` +< HTTP/2 `` +`` +< via: http/1.1 traffic_server (ApacheTrafficServer/``) +`` +> GET /drip?duration=4 HTTP/2 +`` +> GET /drip?duration=4 HTTP/2 +`` +< HTTP/2 `` +`` +< via: http/1.1 traffic_server (ApacheTrafficServer/`` [cWs f ]) +``