From 89b1c8007beea0191b1dabe472a6a8cee725f7fe Mon Sep 17 00:00:00 2001 From: kylecarbs Date: Sun, 26 Jun 2022 21:08:01 +0000 Subject: [PATCH 1/2] fix: Await workspace build job before waiting for CLI output This was causing occasional flakes seen here: https://github.com/coder/coder/runs/7063142245?check_suite_focus=true --- cli/ssh_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/ssh_test.go b/cli/ssh_test.go index 9742852125b54..3bd91e0076125 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{ From 878df1e76698958b863eeeb1bf63240a1fd66721 Mon Sep 17 00:00:00 2001 From: kylecarbs Date: Sun, 26 Jun 2022 21:53:04 +0000 Subject: [PATCH 2/2] Fix test --- cli/server_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cli/server_test.go b/cli/server_test.go index 430be799245a7..dfb219e62f906 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)