This is an automated email from the ASF dual-hosted git repository.
bneradt 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 e3dc7e76c3 stale_response.test.py: address log wait flakiness (#13323)
e3dc7e76c3 is described below
commit e3dc7e76c3555be938ed0ec1a05b6952eff65cec
Author: Brian Neradt <[email protected]>
AuthorDate: Mon Jul 13 13:40:05 2026 -0400
stale_response.test.py: address log wait flakiness (#13323)
The stale_response log checks can run before every directive that
they later assert has been written. Waiting for one marker with a
sleep-based process leaves the final content checks exposed to ATS log
flush timing when both stale directives are expected.
This replaces the sleep-based watcher with explicit await runs for each
directive being asserted. The test now waits for the matching
stale-while-revalidate and stale-if-error entries before performing the
final log content checks.
Fixes: #13301
---
.../stale_response/stale_response.test.py | 32 +++++++++-------------
1 file changed, 13 insertions(+), 19 deletions(-)
diff --git a/tests/gold_tests/pluginTest/stale_response/stale_response.test.py
b/tests/gold_tests/pluginTest/stale_response/stale_response.test.py
index 895fae86e2..b073c45760 100644
--- a/tests/gold_tests/pluginTest/stale_response/stale_response.test.py
+++ b/tests/gold_tests/pluginTest/stale_response/stale_response.test.py
@@ -140,28 +140,22 @@ class TestStaleResponse:
def verify_plugin_log(self) -> None:
"""Verify the contents of the stale_response plugin log."""
- tr = Test.AddTestRun("Verify stale_response plugin log")
- name = f'log_waiter_{TestStaleResponse._ts_counter}'
- log_waiter = tr.Processes.Process(name)
- log_waiter.Command = 'sleep 30'
+ swr_log_pattern = "stale-while-revalidate:.*stale.jpeg"
+ sie_log_pattern = "stale-if-error:.*error.jpeg"
+
+ def expect_log_entry(pattern: str, description: str) -> None:
+ tr = Test.AddAwaitFileContainsTestRun(f"Await {description}",
self._ts.Disk.stale_responses_log.AbsPath, pattern)
+ tr.StillRunningBefore = self._ts
+ tr.StillRunningAfter = self._ts
+ self._ts.Disk.stale_responses_log.Content +=
Testers.ContainsExpression(pattern, f"Verify {description}")
+
if self._option_type == OptionType.FORCE_SWR:
- log_waiter.Ready =
When.FileContains(self._ts.Disk.stale_responses_log.Name,
"stale-while-revalidate:")
- self._ts.Disk.stale_responses_log.Content +=
Testers.ContainsExpression(
- "stale-while-revalidate:.*stale.jpeg", "Verify
stale-while-revalidate directive is logged")
+ expect_log_entry(swr_log_pattern, "stale-while-revalidate
directive is logged")
elif self._option_type == OptionType.FORCE_SIE:
- log_waiter.Ready =
When.FileContains(self._ts.Disk.stale_responses_log.Name, "stale-if-error:")
- self._ts.Disk.stale_responses_log.Content +=
Testers.ContainsExpression(
- "stale-if-error:.*error.jpeg", "Verify stale-if-error
directive is logged")
+ expect_log_entry(sie_log_pattern, "stale-if-error directive is
logged")
else:
- log_waiter.Ready =
When.FileContains(self._ts.Disk.stale_responses_log.Name, "stale-if-error:")
- self._ts.Disk.stale_responses_log.Content +=
Testers.ContainsExpression(
- "stale-while-revalidate:.*stale.jpeg", "Verify
stale-while-revalidate directive is logged")
- self._ts.Disk.stale_responses_log.Content +=
Testers.ContainsExpression(
- "stale-if-error:.*error.jpeg", "Verify stale-if-error
directive is logged")
- p = tr.Processes.Default
- p.Command = 'echo "Waiting upon the stale response log."'
- p.StartBefore(log_waiter)
- p.StillRunningAfter = self._ts
+ expect_log_entry(swr_log_pattern, "stale-while-revalidate
directive is logged")
+ expect_log_entry(sie_log_pattern, "stale-if-error directive is
logged")
TestStaleResponse(OptionType.NONE, is_global=True)
