Add renegotiate apache test to nix/uv/pytest #5352
Open
Conversation
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
Co-authored-by: James Mayclin <[email protected]>
5 tasks
lrstewart
reviewed
Jun 17, 2025
Comment on lines
+114
to
+115
| export PYTEST_ARGS="--provider-version $S2N_LIBCRYPTO -x -n auto --reruns=2 --durations=10 -rpfs --cache-clear --ignore-glob=*test_dynamic_record_sizes* --ignore-glob=*test_session_resumption*" | ||
| uvinteg_snapshot |
There was a problem hiding this comment.
I'm not sure the two excluded tests are obvious enough :/ I'm worried someone looking at the buildspec will think we now have parity between nix and the job that still uses codebuild images, and remove the codebuild image job.
And what's the benefit of this PR? It looks like nix used to be able to run test_session_resumption, but can't anymore?
Comment on lines
84
to
-82
| function integ {(set -e | ||
| apache2_start |
There was a problem hiding this comment.
It seems wrong for uvinteg to start apache, but integ not to anymore. If the integ target doesn't work anymore, shouldn't we just remove it / replace it?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Release Summary:
Resolved issues:
partial for #5040
Description of changes:
Start apache2 with the
uvintegbash function, allowing this test to pass with nix+uv+pytest.Call-outs:
This adds a cleanup routine for apache2 configs, so when doing local runs of the integration tests, the apache2 configs get regenerated. This is not needed in CI, as we're throwing away Docker containers after the test runs.
Testing:
How is this change tested (unit tests, fuzz tests, etc.)? Local, CI.
How can you convince your reviewers that this PR is safe and effective?
Is this a refactor change? If so, how have you proved that the intended behavior hasn't changed?
Remember:
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.