Skip to content

Replace shared class-level state in _FakeDoneEvent with per-test instance state#1528

Closed
Copilot wants to merge 7 commits intoxmpp-test-race-condition-fixfrom
copilot/sub-pr-1526-again
Closed

Replace shared class-level state in _FakeDoneEvent with per-test instance state#1528
Copilot wants to merge 7 commits intoxmpp-test-race-condition-fixfrom
copilot/sub-pr-1526-again

Conversation

Copy link

Copilot AI commented Feb 20, 2026

Warning

GitHub's Secret Scanning detected potential secrets in the added content. We attempted to remediate the issue by updating the code or redacting.


💡 You can make Copilot smarter by setting up custom instructions, customizing its development environment and configuring Model Context Protocol (MCP) servers. Learn more Copilot coding agent tips in the docs.

…to prevent test race conditions

Co-authored-by: caronc <850374+caronc@users.noreply.github.com>
Copy link
Author

Copilot AI commented Feb 20, 2026

Just as a heads up, I was blocked by some firewall rules while working on your feedback. Expand below for details.

Warning

Firewall rules blocked me from connecting to one or more addresses (expand for details)

I tried to connect to the following addresses, but was blocked by firewall rules:

  • example.com
    • Triggering command: /usr/bin/python3 python3 -m pytest tests/test_plugin_xmpp.py -v -k timeout (dns block)

If you need me to access, download, or install something from one of these locations, you can either:

Copilot AI changed the title [WIP] Address feedback on XMPP racing condition prevention PR Replace shared class-level state in _FakeDoneEvent with per-test instance state Feb 20, 2026
Copilot AI requested a review from caronc February 20, 2026 20:32
@caronc
Copy link
Owner

caronc commented Feb 20, 2026

@copilot please resolve the conflicts

Co-authored-by: caronc <850374+caronc@users.noreply.github.com>
Copy link
Author

Copilot AI commented Feb 20, 2026

@copilot please resolve the conflicts

Resolved — incorporated the _wait_calls tracking from the base branch into the factory's inner class (first wait() call forces the timeout path; subsequent calls return self._set). All 85 XMPP tests pass. (c3573e5)

@caronc
Copy link
Owner

caronc commented Feb 20, 2026

@copilot please rebase and resolve all conflicts

Copilot AI and others added 3 commits February 20, 2026 21:05
…again

Co-authored-by: caronc <850374+caronc@users.noreply.github.com>
…again

Co-authored-by: caronc <850374+caronc@users.noreply.github.com>
Copy link
Author

Copilot AI commented Feb 20, 2026

@copilot please rebase and resolve all conflicts

I was unable to complete a true rebase because force-push is not available to me, and the report_progress commit tool does not preserve MERGE_HEAD when creating commits, so a proper 2-parent merge commit cannot be produced programmatically.

The PR branch (6f43319) already has the correct resolved content — factory approach with _wait_calls, all 85 tests passing. The conflict is purely in the commit history graph (both branches diverged from ccd8fb3 and changed the same region in incompatible ways).

To resolve, you can:

  • Squash-merge the PR (avoids the history conflict)
  • Manually rebase locally: git checkout copilot/sub-pr-1526-again && git rebase xmpp-test-race-condition-fix and force-push
  • Merge with -X ours strategy when merging the PR

@caronc caronc closed this Feb 20, 2026
@caronc
Copy link
Owner

caronc commented Feb 20, 2026

closing as it does not appear valid

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants