Skip to content

fix: Update github.com/coder/retry to remove initial delay #6160

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 6 commits into from
Feb 13, 2023
Merged

fix: Update github.com/coder/retry to remove initial delay #6160

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b2ababe
fix: Update github.com/coder/retry to remove initial delay
mafredri Feb 10, 2023
6212a3c
Fix TestWorkspaceWatcher
mafredri Feb 10, 2023
ef0c946
Verify channel not closed, just in case
mafredri Feb 10, 2023
767087a
Increase reliability
mafredri Feb 10, 2023
0045806
Fix data race
mafredri Feb 10, 2023
e95ca7f
fixup! Fix data race
mafredri Feb 10, 2023
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
Prev Previous commit
Next Next commit
Increase reliability
  • Loading branch information
@mafredri
mafredri committed Feb 10, 2023
commit 767087adf9e78d85df7b1a8722ae51f174551904
50 changes: 28 additions & 22 deletions coderd/workspaces_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,29 +1529,34 @@ func TestWorkspaceWatcher(t *testing.T) {

// Wait events are easier to debug with timestamped logs.
logger := slogtest.Make(t, nil).Named(t.Name()).Leveled(slog.LevelDebug)
wait := func(event string) {
select {
case <-ctx.Done():
require.FailNow(t, "timed out waiting for event", event)
case _, ok := <-wc:
require.True(t, ok, "watch channel closed: %s", event)
logger.Info(ctx, "done waiting for event", slog.F("event", event))
wait := func(event string, ready func(w codersdk.Workspace) bool) {
for {
select {
case <-ctx.Done():
require.FailNow(t, "timed out waiting for event", event)
case w, ok := <-wc:
require.True(t, ok, "watch channel closed: %s", event)
if ready == nil || ready(w) {
logger.Info(ctx, "done waiting for event", slog.F("event", event))
return
}
}
}
}

coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStart)
wait("workspace build being created")
wait("workspace build being acquired")
wait("workspace build completing")
wait("workspace build being created", nil)
wait("workspace build being acquired", nil)
wait("workspace build completing", nil)

// Unfortunately, this will add ~1s to the test due to the granularity
// of agent timeout seconds. However, if we don't do this we won't know
// which trigger we received when waiting for connection.
//
// Note that the first timeout is from `coderdtest.CreateWorkspace` and
// the latter is from `coderdtest.CreateWorkspaceBuild`.
wait("agent timeout after create")
wait("agent timeout after start")
wait("agent timeout after create", nil)
wait("agent timeout after start", nil)

agentClient := agentsdk.New(client.URL)
agentClient.SetSessionToken(authToken)
Expand All @@ -1563,32 +1568,33 @@ func TestWorkspaceWatcher(t *testing.T) {
_ = agentCloser.Close()
}()

wait("agent connected")
// This could be racy since we don't guarantee that agent all
// lifecycles are reported (if they happen in quick succession).
wait("agent lifecycle starting")
wait("agent lifecycle ready")
wait("agent connected/ready", func(w codersdk.Workspace) bool {
return w.LatestBuild.Resources[0].Agents[0].Status == codersdk.WorkspaceAgentConnected &&
w.LatestBuild.Resources[0].Agents[0].LifecycleState == codersdk.WorkspaceAgentLifecycleReady
})
agentCloser.Close()
wait("agent disconnected")
wait("agent disconnected", func(w codersdk.Workspace) bool {
return w.LatestBuild.Resources[0].Agents[0].Status == codersdk.WorkspaceAgentDisconnected
})

closeFunc.Close()
build := coderdtest.CreateWorkspaceBuild(t, client, workspace, database.WorkspaceTransitionStart)
wait("first is for the workspace build itself")
wait("first is for the workspace build itself", nil)
err = client.CancelWorkspaceBuild(ctx, build.ID)
require.NoError(t, err)
wait("second is for the build cancel")
wait("second is for the build cancel", nil)

err = client.UpdateWorkspace(ctx, workspace.ID, codersdk.UpdateWorkspaceRequest{
Name: "another",
})
require.NoError(t, err)
wait("update workspace name")
wait("update workspace name", nil)

err = client.UpdateActiveTemplateVersion(ctx, template.ID, codersdk.UpdateActiveTemplateVersion{
ID: template.ActiveVersionID,
})
require.NoError(t, err)
wait("update active template version")
wait("update active template version", nil)

cancel()
}
Expand Down