From dac6838fc3a6a92ee22cc84e79167997efb8542c Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Sun, 26 Jun 2022 17:05:37 -0500 Subject: [PATCH] fix: Await workspace build job before waiting for CLI output (#2670) This was causing occasional flakes seen here: https://github.com/coder/coder/runs/7063142245?check_suite_focus=true --- cli/server_test.go | 2 +- cli/ssh_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/server_test.go b/cli/server_test.go index 430be79924..dfb219e62f 100644 --- a/cli/server_test.go +++ b/cli/server_test.go @@ -170,7 +170,7 @@ func TestServer(t *testing.T) { require.Eventually(t, func() bool { var err error accessURLRaw, err = cfg.URL().Read() - return err == nil + return accessURLRaw != "" && err == nil }, 15*time.Second, 25*time.Millisecond) accessURL, err := url.Parse(accessURLRaw) require.NoError(t, err) diff --git a/cli/ssh_test.go b/cli/ssh_test.go index 9742852125..3bd91e0076 100644 --- a/cli/ssh_test.go +++ b/cli/ssh_test.go @@ -68,6 +68,7 @@ func TestSSH(t *testing.T) { t.Run("ImmediateExit", func(t *testing.T) { t.Parallel() client, workspace, agentToken := setupWorkspaceForSSH(t) + coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) cmd, root := clitest.New(t, "ssh", workspace.Name) clitest.SetupConfig(t, client, root) pty := ptytest.New(t) @@ -79,7 +80,6 @@ func TestSSH(t *testing.T) { assert.NoError(t, err) }) pty.ExpectMatch("Waiting") - coderdtest.AwaitWorkspaceBuildJob(t, client, workspace.LatestBuild.ID) agentClient := codersdk.New(client.URL) agentClient.SessionToken = agentToken agentCloser := agent.New(agentClient.ListenWorkspaceAgent, &agent.Options{