From 37e190c16d24fc489ab804f77f66e953bff02596 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Thu, 7 Sep 2023 10:10:58 -0600 Subject: [PATCH] prefetch_cmcd: make autests more robust by removing need for gold file wildcard --- .../pluginTest/prefetch/prefetch_cmcd.test.py | 4 +-- .../pluginTest/prefetch/prefetch_cmcd0.gold | 26 +++++++++---------- .../pluginTest/prefetch/prefetch_cmcd1.gold | 24 ++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py b/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py index 43017edc05c..3e22ac340c0 100644 --- a/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py +++ b/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd.test.py @@ -191,7 +191,7 @@ logging: formats: - name: custom - format: '% % % % % %<{X-CDN-Prefetch}cqh>' + format: '% % % % % %<{X-CDN-Prefetch}cqh>' logs: - filename: transaction format: custom @@ -222,7 +222,7 @@ logging: formats: - name: custom - format: '% % % % % %<{X-CDN-Prefetch}cqh>' + format: '% % % % % %<{X-CDN-Prefetch}cqh>' logs: - filename: transaction format: custom diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd0.gold b/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd0.gold index 84aeaf45fa1..b19633eb21f 100644 --- a/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd0.gold +++ b/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd0.gold @@ -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 - diff --git a/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd1.gold b/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd1.gold index 1d2b7fceacd..2aef7cd223d 100644 --- a/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd1.gold +++ b/tests/gold_tests/pluginTest/prefetch/prefetch_cmcd1.gold @@ -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 -