Skip to content

Replace flaky test TestIntegrations/RecordingModesSessionTrackers#59610

Merged
zmb3 merged 1 commit intomasterfrom
joerger/replace-flaky-test-RecordingModesSessionTrackers
Sep 26, 2025
Merged

Replace flaky test TestIntegrations/RecordingModesSessionTrackers#59610
zmb3 merged 1 commit intomasterfrom
joerger/replace-flaky-test-RecordingModesSessionTrackers

Conversation

@Joerger
Copy link
Copy Markdown
Contributor

@Joerger Joerger commented Sep 25, 2025

Replace the flaky integration test added in #58707 with a more straightforward test focused on the intended behavioral change from that PR.

Will be manually backported into #59599, #59600, #59601

Fixes #59586

@Joerger Joerger requested review from espadolini and zmb3 September 25, 2025 21:14
@Joerger Joerger added the no-changelog Indicates that a PR does not require a changelog entry label Sep 25, 2025
@zmb3 zmb3 added this pull request to the merge queue Sep 26, 2025
Merged via the queue into master with commit 33bd287 Sep 26, 2025
46 checks passed
@zmb3 zmb3 deleted the joerger/replace-flaky-test-RecordingModesSessionTrackers branch September 26, 2025 15:34
@Joerger Joerger mentioned this pull request Nov 11, 2025
36 tasks
github-merge-queue bot pushed a commit that referenced this pull request Dec 3, 2025
* Fix discrepancies between Node and Proxy recording modes. (#58707)

* Replace flaky test with more straightforward event metadata test. (#59610)

* Make SSH session client provide session params upfront rather than with synchronous `envs@goteleport.com` requests (#59206)

* Coordinate session ID with Node in Proxy recording mode (#59850)

* Generalize PrepareToReceiveSessionID.

* Initialize session ID in the connection context and update it from node current-session-id request.

* Add session-id-query-v2@goteleport.com request and ensure new session ID is correctly set in proxy recording mode during the channel request.

* Replace PrepareToReceiveSessionID with simpler in-place logic.

* Don't emit session events or tracker when proxy forwarding to a Teleport Node.

* Fix missing session tracker for outdated Teleport Node.

* Remove extra major version grace period.

* Update integration test.

* Cleanup current session ID handling and fix failing tests.

* Fix tests.

* Address comments.

* Restructure currentSessionID handling.

* Set newSessionID in test server context.

* Fix integration test.

* Fix AuditOn integration test.

* Address comment on channel close.

* Track session on forwarding node.

* Fix web shutdown.

* Fix nil pointer dereference in test.

* Fix test flake.

* Fix nil pointer in test.

* Fix test flake.

* Update lib/srv/ctx.go

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>

* Forwarding Node accepts client connection after receiving preparing session ID from node. This way, the forwarder can reject client connections if there is an issue preparing the session ID (impossible join sessions).

* Remove check for session.data event which may not be emitted in time for the test.

* Address comments.

---------

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>

---------

Co-authored-by: rosstimothy <39066650+rosstimothy@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

no-changelog Indicates that a PR does not require a changelog entry size/sm

Projects

None yet

Development

Successfully merging this pull request may close these issues.

TestIntegrations/RecordingModesSessionTrackers flakiness

3 participants