synced/coder
1
0
Fork 0
mirror of https://github.com/coder/coder.git synced 2025-07-06 15:41:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Await workspace build job before waiting for CLI output (#2670)

Browse Source 
This was causing occasional flakes seen here:
https://github.com/coder/coder/runs/7063142245?check_suite_focus=true
This commit is contained in:
Kyle Carberry
2022-06-26 17:05:37 -05:00
committed by GitHub
parent 4851d932c4
commit dac6838fc3
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/server_test.go
View File

@ -170,7 +170,7 @@ func TestServer(t *testing.T) {
require.Eventually(t, func() bool { require.Eventually(t, func() bool {
var err error var err error
accessURLRaw, err = cfg.URL().Read() accessURLRaw, err = cfg.URL().Read()
return err == nil return accessURLRaw != "" && err == nil
}, 15*time.Second, 25*time.Millisecond) }, 15*time.Second, 25*time.Millisecond)
accessURL, err := url.Parse(accessURLRaw) accessURL, err := url.Parse(accessURLRaw)
require.NoError(t, err) require.NoError(t, err)

2
cli/ssh_test.go
View File

@ -68,6 +68,7 @@ func TestSSH(t *testing.T) {
t.Run("ImmediateExit", func(t *testing.T) { t.Run("ImmediateExit", func(t *testing.T) {
t.Parallel() t.Parallel()
client, workspace, agentToken := setupWorkspaceForSSH(t) client, workspace, agentToken := setupWorkspaceForSSH(t)
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
cmd, root := clitest.New(t, "ssh", workspace.Name) cmd, root := clitest.New(t, "ssh", workspace.Name)
clitest.SetupConfig(t, client, root) clitest.SetupConfig(t, client, root)
pty := ptytest.New(t) pty := ptytest.New(t)
@ -79,7 +80,6 @@ func TestSSH(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
}) })
pty.ExpectMatch("Waiting") pty.ExpectMatch("Waiting")
coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID)
agentClient := codersdk.New(client.URL) agentClient := codersdk.New(client.URL)
agentClient.SessionToken = agentToken agentClient.SessionToken = agentToken
agentCloser := agent.New(agentClient.ListenWorkspaceAgent, &agent.Options{ agentCloser := agent.New(agentClient.ListenWorkspaceAgent, &agent.Options{