Skip to content

Commit 65aeeea

Browse files
BrunoQuaresmaBrunoQuaresma
committed
Wrap errors and set timeout for tests
1 parent 920e41d commit 65aeeea

File tree

2 files changed

+22
-10
lines changed

2 files changed

+22
-10
lines changed

‎coderd/database/dbmem/dbmem.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5799,12 +5799,12 @@ func (q *FakeQuerier) GetWorkspaceAgentScriptTimingsByBuildID(ctx context.Contex
57995799

58005800
build, err := q.GetWorkspaceBuildByID(ctx, id)
58015801
if err != nil {
5802-
return nil, err
5802+
return nil, xerrors.Errorf("get build: %w", err)
58035803
}
58045804

58055805
resources, err := q.GetWorkspaceResourcesByJobID(ctx, build.JobID)
58065806
if err != nil {
5807-
return nil, err
5807+
return nil, xerrors.Errorf("get resources: %w", err)
58085808
}
58095809
resourceIDs := make([]uuid.UUID, 0, len(resources))
58105810
for _, res := range resources {
@@ -5813,7 +5813,7 @@ func (q *FakeQuerier) GetWorkspaceAgentScriptTimingsByBuildID(ctx context.Contex
58135813

58145814
agents, err := q.GetWorkspaceAgentsByResourceIDs(ctx, resourceIDs)
58155815
if err != nil {
5816-
return nil, err
5816+
return nil, xerrors.Errorf("get agents: %w", err)
58175817
}
58185818
agentIDs := make([]uuid.UUID, 0, len(agents))
58195819
for _, agent := range agents {
@@ -5822,7 +5822,7 @@ func (q *FakeQuerier) GetWorkspaceAgentScriptTimingsByBuildID(ctx context.Contex
58225822

58235823
scripts, err := q.GetWorkspaceAgentScriptsByAgentIDs(ctx, agentIDs)
58245824
if err != nil {
5825-
return nil, err
5825+
return nil, xerrors.Errorf("get scripts: %w", err)
58265826
}
58275827
scriptIDs := make([]uuid.UUID, 0, len(scripts))
58285828
for _, script := range scripts {

‎coderd/workspacebuilds_test.go

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1306,7 +1306,9 @@ func TestWorkspaceBuildTimings(t *testing.T) {
13061306

13071307
// When: fetching an inexistent build
13081308
buildID := uuid.New()
1309-
_, err := client.WorkspaceBuildTimings(context.Background(), buildID)
1309+
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
1310+
t.Cleanup(cancel)
1311+
_, err := client.WorkspaceBuildTimings(ctx, buildID)
13101312

13111313
// Then: expect a not found error
13121314
require.Error(t, err)
@@ -1318,7 +1320,9 @@ func TestWorkspaceBuildTimings(t *testing.T) {
13181320

13191321
// When: fetching timings for a build with no timings
13201322
build := makeBuild()
1321-
res, err := client.WorkspaceBuildTimings(context.Background(), build.ID)
1323+
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
1324+
t.Cleanup(cancel)
1325+
res, err := client.WorkspaceBuildTimings(ctx, build.ID)
13221326

13231327
// Then: return a response with empty timings
13241328
require.NoError(t, err)
@@ -1334,7 +1338,9 @@ func TestWorkspaceBuildTimings(t *testing.T) {
13341338
provisionerTimings := makeProvisionerTimings(build, 5)
13351339

13361340
// Then: return a response with the expected timings
1337-
res, err := client.WorkspaceBuildTimings(context.Background(), build.ID)
1341+
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
1342+
t.Cleanup(cancel)
1343+
res, err := client.WorkspaceBuildTimings(ctx, build.ID)
13381344
require.NoError(t, err)
13391345
require.Len(t, res.ProvisionerTimings, 5)
13401346

@@ -1383,7 +1389,9 @@ func TestWorkspaceBuildTimings(t *testing.T) {
13831389
agentScriptTimings := makeAgentScriptTimings(scripts[0], 5)
13841390

13851391
// Then: return a response with the expected timings
1386-
res, err := client.WorkspaceBuildTimings(context.Background(), build.ID)
1392+
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
1393+
t.Cleanup(cancel)
1394+
res, err := client.WorkspaceBuildTimings(ctx, build.ID)
13871395
require.NoError(t, err)
13881396
require.Len(t, res.AgentScriptTimings, 5)
13891397

@@ -1411,7 +1419,9 @@ func TestWorkspaceBuildTimings(t *testing.T) {
14111419
})
14121420

14131421
// Then: return a response with empty agent script timings
1414-
res, err := client.WorkspaceBuildTimings(context.Background(), build.ID)
1422+
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
1423+
t.Cleanup(cancel)
1424+
res, err := client.WorkspaceBuildTimings(ctx, build.ID)
14151425
require.NoError(t, err)
14161426
require.Empty(t, res.AgentScriptTimings)
14171427
})
@@ -1427,7 +1437,9 @@ func TestWorkspaceBuildTimings(t *testing.T) {
14271437
})
14281438

14291439
// Then: return a response with empty agent script timings
1430-
res, err := client.WorkspaceBuildTimings(context.Background(), build.ID)
1440+
ctx, cancel := context.WithTimeout(context.Background(), testutil.WaitShort)
1441+
t.Cleanup(cancel)
1442+
res, err := client.WorkspaceBuildTimings(ctx, build.ID)
14311443
require.NoError(t, err)
14321444
require.Empty(t, res.AgentScriptTimings)
14331445
})

0 commit comments

Comments
 (0)