This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.2.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit a358ef2990679de11d6e1f9604c5a43eb98b24ab Author: Brian Neradt <[email protected]> AuthorDate: Mon Jul 20 15:24:39 2026 -0500 jax_fingerprint.test.py: address log wait flakiness (#13324) The jax_fingerprint AuTest split its log verification between a broad await for the method name and a later file-content assertion for the fingerprint line. On CI, that can still leave the final assertion observing the log before the fingerprint entry has been proven present. This makes the await check the fingerprint-shaped log entry directly and keeps the file-content assertion on the same pattern, so each variant both waits for and verifies the exact log content it needs. Fixes: #13300 (cherry picked from commit e015a607bc84fca7671eff5c256e15fb07271417) --- tests/gold_tests/pluginTest/jax_fingerprint/jax_fingerprint.test.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/gold_tests/pluginTest/jax_fingerprint/jax_fingerprint.test.py b/tests/gold_tests/pluginTest/jax_fingerprint/jax_fingerprint.test.py index 5cb8389618..3844cc1914 100644 --- a/tests/gold_tests/pluginTest/jax_fingerprint/jax_fingerprint.test.py +++ b/tests/gold_tests/pluginTest/jax_fingerprint/jax_fingerprint.test.py @@ -101,6 +101,7 @@ class JaxFingerprintTest: # HTTP/2 always runs over TLS (h2 requires TLS). self._needs_tls = method in ('JA3', 'JA4') or http2 self._replay_file = self._choose_replay_file() + self._fingerprint_pattern = rf'{self._method}: [a-z0-9_-]+' tr = Test.AddTestRun(name) self._configure_dns(tr) @@ -108,7 +109,7 @@ class JaxFingerprintTest: self._configure_trafficserver() self._configure_client(tr) Test.AddAwaitFileContainsTestRun( - f'Await jax_fingerprint.log for: {self._name}', self._ts.Disk.jax_log.AbsPath, self._method) + f'Await jax_fingerprint.log for: {self._name}', self._ts.Disk.jax_log.AbsPath, self._fingerprint_pattern) if self._log_field: log_field_path = os.path.join(self._ts.Variables.LOGDIR, 'jax_log_field.log') @@ -224,7 +225,7 @@ class JaxFingerprintTest: log_path = os.path.join(self._ts.Variables.LOGDIR, 'jax_fingerprint.log') self._ts.Disk.File(log_path, id='jax_log') self._ts.Disk.jax_log.Content += Testers.ContainsExpression( - rf'.*{self._method}:.*', f'Verify the log contains a {self._method} fingerprint.', reflags=re.MULTILINE) + self._fingerprint_pattern, f'Verify the jax_fingerprint log contains a {self._method} fingerprint.') backend = f'{scheme}://jax.backend.test:{server_port}' backend_no_plugin = f'{scheme}://jax.backend.test:{server_port}'
