[10.2.x] Fix unit test & AuTest#13341
Open
masaori335 wants to merge 4 commits into
Open
Conversation
apache#13278 dropped this definition, but test_proxy links ts::http (which references IpAllow::subjects) ahead of ts::proxy (which defines it). GNU ld's single-pass archive scan then leaves the symbol unresolved, breaking the Linux build; macOS links fine. master avoids this incidentally via test_PluginYAML.cc from the unbackported plugin.yaml migration (apache#13070).
These tests were backported from master, where the default cert config is ssl_multicert.yaml and the harness exposes ts.Disk.ssl_multicert_yaml. On 10.2.x the default is still legacy ssl_multicert.config and no ssl_multicert_yaml Disk attribute is registered, so the tests failed at collection. Switch them to the ssl_multicert.config one-liner used by the other 10.2.x TLS tests.
masaori335
changed the title
curl 8.20 intentionally mirrors --haproxy-clientip into both PROXY addresses to keep the header address family consistent. The TSVConnPPInfo AuTest still expected the older destination address, so jobs with newer curl failed even though ATS preserved the PROXY metadata it received. This relaxes the destination-address expectation to accept either curl behavior while continuing to verify the source address and PROXY metadata. This also wraps the long curl command strings while leaving the test's request flow unchanged. (cherry picked from commit ad0ce02)
The remap ACL AuTests run hundreds of reload scenarios in a single case, and the Fedora 44 shard is sensitive to extra reload-wait overhead, causing the tests to hang. Their reload sentinel also counted only explicit reloads, even though the log contains the startup load marker too. This replaces the long-lived sleep Ready helper with a short command that exits once the expected reload marker count is present. This also waits for the startup marker plus the explicit reload count, so each scenario observes the reload it just requested. (cherry picked from commit c52eeda)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
1. proxy/unit_tests: restore IpAllow::subjects stub definition
It looks like PRB against 10.2.x are broken. #13278 dropped
IpAllow::subjectsdefinition, but test_proxy links ts::http (which references it) ahead of ts::proxy (which defines it). GNU ld's single-pass archive scan then leaves the symbol unresolved, breaking the Linux build; macOS links fine.The master branch avoids this incidentally via
test_PluginYAML.ccfrom the unbackported plugin.yaml migration (#13070).2. TLS AuTest
Several TLS AuTest assume ssl_multicert.yaml, but 10.2.x still using ssl_multicert.config.
3. Cherry-pick curl 8.20 test update
curl 8.20 test update: curl PROXY destination changes (#13239)
4. Cherry-pick remap ACL Autest Fix
fedora:44: Trim remap ACL reload waits (#13237)