fix: stop waiting for Agent in a goroutine in ssh test #12268
Merged
+3
−6
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
|
This stack of pull requests is managed by Graphite. Learn more about stacking. Join @spikecurtis and the rest of your teammates on |
mafredri
approved these changes
Feb 22, 2024
| }) | ||
| // When the agent connects, the workspace was started, and we should | ||
| // have access to the shell. | ||
| _ = agenttest.New(t, client.URL, authToken) |
There was a problem hiding this comment.
Could consider a defer a.Close() here too, to speed up the agents tear-down, not sure whether or not it would help with the issue being fixed here though.
There was a problem hiding this comment.
I think it will amount to the same thing. There is already a t.Cleanup() that closes it, which will run after the later defers in this function.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Fixes race seen here: https://github.com/coder/coder/runs/21852483781
What happens is that the agent connects, completes the test, and then disconnects before the Eventually condition runs. The waiter then times out because it's looking for a connected agent.
Then, since it's a
requirein a goroutine, that causes thetGocleanup to hang and the whole test suite to timeout after 10 minutes.Anyway,
agenttest.Newdoesn't block, and we don't actually need to wait for the agent to connect, since a successful SSH session is evidence that it connected.