Skip to content

test(cli): prevent flake due to outdated build in TestSSH #12760

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 26, 2024
Merged

test(cli): prevent flake due to outdated build in TestSSH #12760

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bd2b82
test(cli): Prevent flake due to outdated build in TestSSH
mafredri Mar 26, 2024
4c4fcad
add delay to StartStoppedWorkspace as well
mafredri Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
test(cli): Prevent flake due to outdated build in TestSSH
  • Loading branch information
@mafredri
mafredri committed Mar 26, 2024
commit 9bd2b826bebae119a97972c479cf94a52f4c52bf
14 changes: 13 additions & 1 deletion cli/ssh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ func TestSSH(t *testing.T) {
workspaceBuild := coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStop)
coderdtest.AwaitWorkspaceBuildJobCompleted(t, client, workspaceBuild.ID)

ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitLong)
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitSuperLong)
defer cancel()

clientStdinR, clientStdinW := io.Pipe()
Expand Down Expand Up @@ -461,6 +461,18 @@ func TestSSH(t *testing.T) {
assert.NoError(t, err)
})

// Delay until workspace is starting, otherwise the agent may be
// booted due to outdated build.
var err error
for {
workspace, err = client.Workspace(ctx, workspace.ID)
require.NoError(t, err)
if workspace.LatestBuild.Transition == codersdk.WorkspaceTransitionStart {
break
}
time.Sleep(testutil.IntervalFast)
}

// When the agent connects, the workspace was started, and we should
// have access to the shell.
_ = agenttest.New(t, client.URL, authToken)
Expand Down