Skip to content

Commit e54ba2a

Browse files
ssncferreirassncferreira
committed
refactor: use testutil.RequireReceive for receiving workspace lifecycle stats
1 parent b2c130f commit e54ba2a

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

‎coderd/autobuild/lifecycle_executor_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,7 +1251,7 @@ func TestExecutorPrebuilds(t *testing.T) {
12511251
}()
12521252

12531253
// Then: the prebuilt workspace should remain in a start transition
1254-
prebuildStats := <-statsCh
1254+
prebuildStats := testutil.RequireReceive(ctx, t, statsCh)
12551255
require.Len(t, prebuildStats.Errors, 0)
12561256
require.Len(t, prebuildStats.Transitions, 0)
12571257
require.Equal(t, codersdk.WorkspaceTransitionStart, prebuild.LatestBuild.Transition)
@@ -1276,7 +1276,7 @@ func TestExecutorPrebuilds(t *testing.T) {
12761276
}()
12771277

12781278
// Then: the workspace should be stopped
1279-
workspaceStats := <-statsCh
1279+
workspaceStats := testutil.RequireReceive(ctx, t, statsCh)
12801280
require.Len(t, workspaceStats.Errors, 0)
12811281
require.Len(t, workspaceStats.Transitions, 1)
12821282
require.Contains(t, workspaceStats.Transitions, workspace.ID)
@@ -1343,7 +1343,7 @@ func TestExecutorPrebuilds(t *testing.T) {
13431343
}()
13441344

13451345
// Then: the prebuilt workspace should remain in a stop transition
1346-
prebuildStats := <-statsCh
1346+
prebuildStats := testutil.RequireReceive(ctx, t, statsCh)
13471347
require.Len(t, prebuildStats.Errors, 0)
13481348
require.Len(t, prebuildStats.Transitions, 0)
13491349
require.Equal(t, codersdk.WorkspaceTransitionStop, prebuild.LatestBuild.Transition)
@@ -1388,7 +1388,7 @@ func TestExecutorPrebuilds(t *testing.T) {
13881388
}()
13891389

13901390
// Then: the workspace should eventually be started
1391-
workspaceStats := <-statsCh
1391+
workspaceStats := testutil.RequireReceive(ctx, t, statsCh)
13921392
require.Len(t, workspaceStats.Errors, 0)
13931393
require.Len(t, workspaceStats.Transitions, 1)
13941394
require.Contains(t, workspaceStats.Transitions, workspace.ID)

‎enterprise/coderd/workspaces_test.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1913,7 +1913,7 @@ func TestPrebuildsAutobuild(t *testing.T) {
19131913
}()
19141914

19151915
// Then: the prebuilt workspace should remain in a start transition
1916-
prebuildStats := <-statsCh
1916+
prebuildStats := testutil.RequireReceive(ctx, t, statsCh)
19171917
require.Len(t, prebuildStats.Errors, 0)
19181918
require.Len(t, prebuildStats.Transitions, 0)
19191919
require.Equal(t, codersdk.WorkspaceTransitionStart, prebuild.LatestBuild.Transition)
@@ -1938,7 +1938,7 @@ func TestPrebuildsAutobuild(t *testing.T) {
19381938
}()
19391939

19401940
// Then: the workspace should be stopped
1941-
workspaceStats := <-statsCh
1941+
workspaceStats := testutil.RequireReceive(ctx, t, statsCh)
19421942
require.Len(t, workspaceStats.Errors, 0)
19431943
require.Len(t, workspaceStats.Transitions, 1)
19441944
require.Contains(t, workspaceStats.Transitions, workspace.ID)
@@ -2036,7 +2036,7 @@ func TestPrebuildsAutobuild(t *testing.T) {
20362036
}()
20372037

20382038
// Then: the prebuilt workspace should remain in a start transition
2039-
prebuildStats := <-statsCh
2039+
prebuildStats := testutil.RequireReceive(ctx, t, statsCh)
20402040
require.Len(t, prebuildStats.Errors, 0)
20412041
require.Len(t, prebuildStats.Transitions, 0)
20422042
require.Equal(t, codersdk.WorkspaceTransitionStart, prebuild.LatestBuild.Transition)
@@ -2060,7 +2060,7 @@ func TestPrebuildsAutobuild(t *testing.T) {
20602060
}()
20612061

20622062
// Then: the workspace should be stopped
2063-
workspaceStats := <-statsCh
2063+
workspaceStats := testutil.RequireReceive(ctx, t, statsCh)
20642064
require.Len(t, workspaceStats.Errors, 0)
20652065
require.Len(t, workspaceStats.Transitions, 1)
20662066
require.Contains(t, workspaceStats.Transitions, workspace.ID)
@@ -2160,7 +2160,7 @@ func TestPrebuildsAutobuild(t *testing.T) {
21602160
}()
21612161

21622162
// Then: the prebuilt workspace should remain in a stop transition
2163-
prebuildStats := <-statsCh
2163+
prebuildStats := testutil.RequireReceive(ctx, t, statsCh)
21642164
require.Len(t, prebuildStats.Errors, 0)
21652165
require.Len(t, prebuildStats.Transitions, 0)
21662166
require.Equal(t, codersdk.WorkspaceTransitionStop, prebuild.LatestBuild.Transition)
@@ -2194,7 +2194,7 @@ func TestPrebuildsAutobuild(t *testing.T) {
21942194
}()
21952195

21962196
// Then: the workspace should have a NextStartAt equal to the next autostart schedule
2197-
workspaceStats := <-statsCh
2197+
workspaceStats := testutil.RequireReceive(ctx, t, statsCh)
21982198
require.Len(t, workspaceStats.Errors, 0)
21992199
require.Len(t, workspaceStats.Transitions, 1)
22002200
workspace = coderdtest.MustWorkspace(t, client, workspace.ID)
@@ -2290,7 +2290,7 @@ func TestPrebuildsAutobuild(t *testing.T) {
22902290
}()
22912291

22922292
// Then: the prebuilt workspace should remain in a start transition
2293-
prebuildStats := <-statsCh
2293+
prebuildStats := testutil.RequireReceive(ctx, t, statsCh)
22942294
require.Len(t, prebuildStats.Errors, 0)
22952295
require.Len(t, prebuildStats.Transitions, 0)
22962296
require.Equal(t, codersdk.WorkspaceTransitionStart, prebuild.LatestBuild.Transition)
@@ -2314,7 +2314,7 @@ func TestPrebuildsAutobuild(t *testing.T) {
23142314
}()
23152315

23162316
// Then: the workspace should transition to stopped state for breaching dormant TTL
2317-
workspaceStats := <-statsCh
2317+
workspaceStats := testutil.RequireReceive(ctx, t, statsCh)
23182318
require.Len(t, workspaceStats.Errors, 0)
23192319
require.Len(t, workspaceStats.Transitions, 1)
23202320
require.Contains(t, workspaceStats.Transitions, workspace.ID)
@@ -2333,7 +2333,7 @@ func TestPrebuildsAutobuild(t *testing.T) {
23332333
}()
23342334

23352335
// Then: the workspace should be deleted
2336-
dormantWorkspaceStats := <-statsCh
2336+
dormantWorkspaceStats := testutil.RequireReceive(ctx, t, statsCh)
23372337
require.Len(t, dormantWorkspaceStats.Errors, 0)
23382338
require.Len(t, dormantWorkspaceStats.Transitions, 1)
23392339
require.Contains(t, dormantWorkspaceStats.Transitions, workspace.ID)
@@ -2433,7 +2433,7 @@ func TestPrebuildsAutobuild(t *testing.T) {
24332433
}()
24342434

24352435
// Then: the prebuilt workspace should remain in a start transition
2436-
prebuildStats := <-statsCh
2436+
prebuildStats := testutil.RequireReceive(ctx, t, statsCh)
24372437
require.Len(t, prebuildStats.Errors, 0)
24382438
require.Len(t, prebuildStats.Transitions, 0)
24392439
require.Equal(t, codersdk.WorkspaceTransitionStart, prebuild.LatestBuild.Transition)

0 commit comments

Comments
 (0)