Skip to content

lib2405: adjust for non-threaded builds - #22414

Closed
bagder wants to merge 5 commits into
masterfrom
bagder/2405
Closed

lib2405: adjust for non-threaded builds#22414
bagder wants to merge 5 commits into
masterfrom
bagder/2405

Conversation

@bagder

@bagder bagder commented Jul 28, 2026

Copy link
Copy Markdown
Member
  • Attempt to fix the flakiness set in 9726fc8
  • Reduce macro use

- Attempt to fix the flakiness set in 9726fc8
- Reduce macro use
@bagder bagder added the tests label Jul 28, 2026
@bagder

bagder commented Jul 28, 2026

Copy link
Copy Markdown
Member Author

Lesson: stop linking to CI logs in commit messages, because they are likely gone by the time we want to follow those links...

@bagder
bagder marked this pull request as ready for review July 28, 2026 10:16
@bagder
bagder requested a review from Copilot July 28, 2026 10:16

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the lib2405/lib2407 test logic to make curl_multi_waitfds() expectations depend on whether the build uses an async/threaded resolver, with the goal of eliminating prior flakiness and reducing preprocessor macro usage. It also removes the flaky keyword from the corresponding test definitions.

Changes:

  • Replace macro-based “run + check” helpers in lib2405.c with a real helper function and compute expected waitfd counts based on resolver mode.
  • Add a resolver-mode detection helper using curl_version_info() feature metadata.
  • Remove the flaky keyword from tests/data/test2405 and tests/data/test2407.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 4 comments.

File Description
tests/libtest/lib2405.c Refactors checks into functions and adjusts expected waitfd counts based on resolver mode.
tests/data/test2405 Removes flaky keyword for the test.
tests/data/test2407 Removes flaky keyword for the test.
Comments suppressed due to low confidence (1)

tests/libtest/lib2405.c:396

  • This comment says "+ wakeup" unconditionally, but the expected fd count is now conditional on uses_threaded_resolver. Update the comment to match the new expectation.
    /* HTTP2, one for each transfer + wakeup */

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread tests/libtest/lib2405.c Outdated
Comment thread tests/libtest/lib2405.c
Comment thread tests/libtest/lib2405.c Outdated
Comment thread tests/libtest/lib2405.c Outdated
@testclutch

Copy link
Copy Markdown

Analysis of PR #22414 at 848a6830:

Test 710 failed, which has NOT been flaky recently, so there could be a real issue in this PR. Note that this test has failed in 4 different CI jobs (the link just goes to one of them).

Generated by Testclutch

@bagder bagder closed this in c732874 Jul 28, 2026
@bagder
bagder deleted the bagder/2405 branch July 28, 2026 11:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Development

Successfully merging this pull request may close these issues.

3 participants