Skip to content

Help background fill autest to run on ubuntu #10936

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
duke8253 merged 1 commit into from
Apr 29, 2024
Merged

Help background fill autest to run on ubuntu #10936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions tests/gold_tests/cache/background_fill.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))
Expand Down Expand Up @@ -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):
Expand All @@ -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):
Expand All @@ -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):
Expand Down
4 changes: 1 addition & 3 deletions .../cache/gold/background_fill_0_stderr.gold → ...ache/gold/background_fill_0_stderr_H.gold
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ])
``
15 changes: 15 additions & 0 deletions tests/gold_tests/cache/gold/background_fill_0_stderr_W.gold
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ])
``
6 changes: 2 additions & 4 deletions .../cache/gold/background_fill_1_stderr.gold → ...ache/gold/background_fill_1_stderr_H.gold
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ])
``
15 changes: 15 additions & 0 deletions tests/gold_tests/cache/gold/background_fill_1_stderr_W.gold
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ])
``
4 changes: 1 addition & 3 deletions .../cache/gold/background_fill_2_stderr.gold → ...ache/gold/background_fill_2_stderr_H.gold
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ])
``
15 changes: 15 additions & 0 deletions tests/gold_tests/cache/gold/background_fill_2_stderr_W.gold
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ])
``