Skip to content

prefetch_cmcd: make autests more robust by removing need for gold file wildcard #10382

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
traeak merged 1 commit into from
Sep 7, 2023
Merged

prefetch_cmcd: make autests more robust by removing need for gold file wildcard #10382

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
4 changes: 2 additions & 2 deletions tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@
logging:
formats:
- name: custom
format: '%<cquuc> %<pssc> %<crc> %<cwr> %<pscl> %<{X-CDN-Prefetch}cqh>'
format: '%<cquup> %<pssc> %<crc> %<cwr> %<pscl> %<{X-CDN-Prefetch}cqh>'
logs:
- filename: transaction
format: custom
Expand Down Expand Up @@ -222,7 +222,7 @@
logging:
formats:
- name: custom
format: '%<cquuc> %<pssc> %<crc> %<cwr> %<pscl> %<{X-CDN-Prefetch}cqh>'
format: '%<cquup> %<pssc> %<crc> %<cwr> %<pscl> %<{X-CDN-Prefetch}cqh>'
logs:
- filename: transaction
format: custom
Expand Down
26 changes: 13 additions & 13 deletions tests/gold_tests/pluginTest/prefetch/prefetch_cmcd0.gold
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
http://ts0/tests/request.txt 200 TCP_MISS FIN 33 -
http://ts0/tests/request.txt 200 TCP_HIT - 33 -
http://ts0/tests/prefetch.txt 200 TCP_MISS - 16 tests/request.txt
http://ts0/tests/prefetch.txt 200 TCP_MISS FIN 34 -
http://ts0/tests/request.txt 200 ``_HIT - 33 -
http://ts0/tests/prefetch.txt 208 TCP_HIT - 20 tests/request.txt
http://ts0/tests/prefetch.txt 200 ``_HIT - 34 -
http://ts0/tests/query?this=foo&that 200 TCP_MISS FIN 41 -
http://ts0/tests/query?bar=baz 200 TCP_MISS - 16 tests/query
http://ts0/tests/query?bar=baz 200 TCP_MISS FIN 35 -
http://ts0/root.txt 200 TCP_MISS FIN 30 -
http://ts0/rooted 200 TCP_MISS - 16 root.txt
http://ts0/crr.txt 404 TCP_MISS - 5 -
/tests/request.txt 200 TCP_MISS FIN 33 -
/tests/request.txt 200 TCP_HIT - 33 -
/tests/prefetch.txt 200 TCP_MISS - 16 tests/request.txt
/tests/prefetch.txt 200 TCP_MISS FIN 34 -
/tests/request.txt 200 ``_HIT - 33 -
/tests/prefetch.txt 208 TCP_HIT - 20 tests/request.txt
/tests/prefetch.txt 200 ``_HIT - 34 -
/tests/query?this=foo&that 200 TCP_MISS FIN 41 -
/tests/query?bar=baz 200 TCP_MISS - 16 tests/query
/tests/query?bar=baz 200 TCP_MISS FIN 35 -
/root.txt 200 TCP_MISS FIN 30 -
/rooted 200 TCP_MISS - 16 root.txt
/crr.txt 404 TCP_MISS - 5 -
24 changes: 12 additions & 12 deletions tests/gold_tests/pluginTest/prefetch/prefetch_cmcd1.gold
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
http://ts1:``/tests/request.txt 200 TCP_MISS FIN 33 -
http://ts1:``/tests/prefetch.txt 200 TCP_MISS - 16 tests/request.txt
http://ts1:``/tests/prefetch.txt 200 TCP_MISS FIN 34 -
http://ts1:``/tests/prefetch.txt 200 TCP_HIT - 34 -
http://ts1:``/tests/query?this=foo&that 200 TCP_MISS FIN 41 -
http://ts1:``/tests/query?bar=baz 200 TCP_MISS - 16 tests/query
http://ts1:``/tests/query?bar=baz 200 TCP_MISS FIN 35 -
http://ts1:``/tests/query?bar=baz 200 TCP_HIT - 35 -
http://ts1:``/root.txt 200 TCP_MISS FIN 30 -
http://ts1:``/rooted 200 TCP_MISS - 16 root.txt
http://ts1:``/rooted 200 TCP_MISS FIN 28 -
http://ts1:``/crr.txt 404 TCP_MISS - 5 -
/tests/request.txt 200 TCP_MISS FIN 33 -
/tests/prefetch.txt 200 TCP_MISS - 16 tests/request.txt
/tests/prefetch.txt 200 TCP_MISS FIN 34 -
/tests/prefetch.txt 200 TCP_HIT - 34 -
/tests/query?this=foo&that 200 TCP_MISS FIN 41 -
/tests/query?bar=baz 200 TCP_MISS - 16 tests/query
/tests/query?bar=baz 200 TCP_MISS FIN 35 -
/tests/query?bar=baz 200 TCP_HIT - 35 -
/root.txt 200 TCP_MISS FIN 30 -
/rooted 200 TCP_MISS - 16 root.txt
/rooted 200 TCP_MISS FIN 28 -
/crr.txt 404 TCP_MISS - 5 -