Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5dff2ac

Browse files
committed
unexport test helper methods
1 parentd5ce4a2 commit5dff2ac

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎coderd/autostart/lifecycle/lifecycle_executor_test.go

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ func Test_Executor_Autostart_OK(t *testing.T) {
2525
LifecycleTicker:tickCh,
2626
})
2727
// Given: we have a user with a workspace
28-
workspace=MustProvisionWorkspace(t,client)
28+
workspace=mustProvisionWorkspace(t,client)
2929
)
3030
// Given: workspace is stopped
31-
MustTransitionWorkspace(t,client,workspace.ID,database.WorkspaceTransitionStart,database.WorkspaceTransitionStop)
31+
mustTransitionWorkspace(t,client,workspace.ID,database.WorkspaceTransitionStart,database.WorkspaceTransitionStop)
3232

3333
// Given: the workspace initially has autostart disabled
3434
require.Empty(t,workspace.AutostartSchedule)
@@ -48,7 +48,7 @@ func Test_Executor_Autostart_OK(t *testing.T) {
4848

4949
// Then: the workspace should be started
5050
require.Eventually(t,func()bool {
51-
ws:=coderdtest.MustWorkspace(t,client,workspace.ID)
51+
ws:=mustWorkspace(t,client,workspace.ID)
5252
returnws.LatestBuild.Job.Status==codersdk.ProvisionerJobSucceeded&&
5353
ws.LatestBuild.Transition==database.WorkspaceTransitionStart
5454
},5*time.Second,250*time.Millisecond)
@@ -65,7 +65,7 @@ func Test_Executor_Autostart_AlreadyRunning(t *testing.T) {
6565
LifecycleTicker:tickCh,
6666
})
6767
// Given: we have a user with a workspace
68-
workspace=MustProvisionWorkspace(t,client)
68+
workspace=mustProvisionWorkspace(t,client)
6969
)
7070

7171
// Given: we ensure the workspace is running
@@ -89,7 +89,7 @@ func Test_Executor_Autostart_AlreadyRunning(t *testing.T) {
8989

9090
// Then: the workspace should not be started.
9191
require.Never(t,func()bool {
92-
ws:=coderdtest.MustWorkspace(t,client,workspace.ID)
92+
ws:=mustWorkspace(t,client,workspace.ID)
9393
returnws.LatestBuild.ID!=workspace.LatestBuild.ID&&ws.LatestBuild.Transition==database.WorkspaceTransitionStart
9494
},5*time.Second,250*time.Millisecond)
9595
}
@@ -103,11 +103,11 @@ func Test_Executor_Autostart_NotEnabled(t *testing.T) {
103103
LifecycleTicker:tickCh,
104104
})
105105
// Given: we have a user with a workspace
106-
workspace=MustProvisionWorkspace(t,client)
106+
workspace=mustProvisionWorkspace(t,client)
107107
)
108108

109109
// Given: workspace is stopped
110-
MustTransitionWorkspace(t,client,workspace.ID,database.WorkspaceTransitionStart,database.WorkspaceTransitionStop)
110+
mustTransitionWorkspace(t,client,workspace.ID,database.WorkspaceTransitionStart,database.WorkspaceTransitionStop)
111111

112112
// Given: the workspace has autostart disabled
113113
require.Empty(t,workspace.AutostartSchedule)
@@ -120,7 +120,7 @@ func Test_Executor_Autostart_NotEnabled(t *testing.T) {
120120

121121
// Then: the workspace should not be started.
122122
require.Never(t,func()bool {
123-
ws:=coderdtest.MustWorkspace(t,client,workspace.ID)
123+
ws:=mustWorkspace(t,client,workspace.ID)
124124
returnws.LatestBuild.ID!=workspace.LatestBuild.ID&&ws.LatestBuild.Transition==database.WorkspaceTransitionStart
125125
},5*time.Second,250*time.Millisecond)
126126
}
@@ -136,7 +136,7 @@ func Test_Executor_Autostop_OK(t *testing.T) {
136136
LifecycleTicker:tickCh,
137137
})
138138
// Given: we have a user with a workspace
139-
workspace=MustProvisionWorkspace(t,client)
139+
workspace=mustProvisionWorkspace(t,client)
140140
)
141141
// Given: workspace is running
142142
require.Equal(t,database.WorkspaceTransitionStart,workspace.LatestBuild.Transition)
@@ -159,7 +159,7 @@ func Test_Executor_Autostop_OK(t *testing.T) {
159159

160160
// Then: the workspace should be started
161161
require.Eventually(t,func()bool {
162-
ws:=coderdtest.MustWorkspace(t,client,workspace.ID)
162+
ws:=mustWorkspace(t,client,workspace.ID)
163163
returnws.LatestBuild.ID!=workspace.LatestBuild.ID&&ws.LatestBuild.Transition==database.WorkspaceTransitionStop
164164
},5*time.Second,250*time.Millisecond)
165165
}
@@ -174,11 +174,11 @@ func Test_Executor_Autostop_AlreadyStopped(t *testing.T) {
174174
LifecycleTicker:tickCh,
175175
})
176176
// Given: we have a user with a workspace
177-
workspace=MustProvisionWorkspace(t,client)
177+
workspace=mustProvisionWorkspace(t,client)
178178
)
179179

180180
// Given: workspace is stopped
181-
MustTransitionWorkspace(t,client,workspace.ID,database.WorkspaceTransitionStart,database.WorkspaceTransitionStop)
181+
mustTransitionWorkspace(t,client,workspace.ID,database.WorkspaceTransitionStart,database.WorkspaceTransitionStop)
182182

183183
// Given: the workspace initially has autostart disabled
184184
require.Empty(t,workspace.AutostopSchedule)
@@ -198,7 +198,7 @@ func Test_Executor_Autostop_AlreadyStopped(t *testing.T) {
198198

199199
// Then: the workspace should not be stopped.
200200
require.Never(t,func()bool {
201-
ws:=coderdtest.MustWorkspace(t,client,workspace.ID)
201+
ws:=mustWorkspace(t,client,workspace.ID)
202202
returnws.LatestBuild.ID==workspace.LatestBuild.ID&&ws.LatestBuild.Transition==database.WorkspaceTransitionStop
203203
},5*time.Second,250*time.Millisecond)
204204
}
@@ -212,7 +212,7 @@ func Test_Executor_Autostop_NotEnabled(t *testing.T) {
212212
LifecycleTicker:tickCh,
213213
})
214214
// Given: we have a user with a workspace
215-
workspace=MustProvisionWorkspace(t,client)
215+
workspace=mustProvisionWorkspace(t,client)
216216
)
217217

218218
// Given: workspace is running
@@ -229,7 +229,7 @@ func Test_Executor_Autostop_NotEnabled(t *testing.T) {
229229

230230
// Then: the workspace should not be stopped.
231231
require.Never(t,func()bool {
232-
ws:=coderdtest.MustWorkspace(t,client,workspace.ID)
232+
ws:=mustWorkspace(t,client,workspace.ID)
233233
returnws.LatestBuild.ID==workspace.LatestBuild.ID&&ws.LatestBuild.Transition==database.WorkspaceTransitionStop
234234
},5*time.Second,250*time.Millisecond)
235235
}
@@ -245,7 +245,7 @@ func Test_Executor_Workspace_Deleted(t *testing.T) {
245245
LifecycleTicker:tickCh,
246246
})
247247
// Given: we have a user with a workspace
248-
workspace=MustProvisionWorkspace(t,client)
248+
workspace=mustProvisionWorkspace(t,client)
249249
)
250250

251251
// Given: the workspace initially has autostart disabled
@@ -259,7 +259,7 @@ func Test_Executor_Workspace_Deleted(t *testing.T) {
259259
}))
260260

261261
// Given: workspace is deleted
262-
MustTransitionWorkspace(t,client,workspace.ID,database.WorkspaceTransitionStart,database.WorkspaceTransitionDelete)
262+
mustTransitionWorkspace(t,client,workspace.ID,database.WorkspaceTransitionStart,database.WorkspaceTransitionDelete)
263263

264264
// When: the lifecycle executor ticks
265265
gofunc() {
@@ -269,12 +269,12 @@ func Test_Executor_Workspace_Deleted(t *testing.T) {
269269

270270
// Then: nothing should happen
271271
require.Never(t,func()bool {
272-
ws:=coderdtest.MustWorkspace(t,client,workspace.ID)
272+
ws:=mustWorkspace(t,client,workspace.ID)
273273
returnws.LatestBuild.Transition!=database.WorkspaceTransitionDelete
274274
},5*time.Second,250*time.Millisecond)
275275
}
276276

277-
funcMustProvisionWorkspace(t*testing.T,client*codersdk.Client) codersdk.Workspace {
277+
funcmustProvisionWorkspace(t*testing.T,client*codersdk.Client) codersdk.Workspace {
278278
t.Helper()
279279
coderdtest.NewProvisionerDaemon(t,client)
280280
user:=coderdtest.CreateFirstUser(t,client)
@@ -283,10 +283,10 @@ func MustProvisionWorkspace(t *testing.T, client *codersdk.Client) codersdk.Work
283283
coderdtest.AwaitTemplateVersionJob(t,client,version.ID)
284284
ws:=coderdtest.CreateWorkspace(t,client,user.OrganizationID,template.ID)
285285
coderdtest.AwaitWorkspaceBuildJob(t,client,ws.LatestBuild.ID)
286-
returncoderdtest.MustWorkspace(t,client,ws.ID)
286+
returnmustWorkspace(t,client,ws.ID)
287287
}
288288

289-
funcMustTransitionWorkspace(t*testing.T,client*codersdk.Client,workspaceID uuid.UUID,from,to database.WorkspaceTransition) {
289+
funcmustTransitionWorkspace(t*testing.T,client*codersdk.Client,workspaceID uuid.UUID,from,to database.WorkspaceTransition) {
290290
t.Helper()
291291
ctx:=context.Background()
292292
workspace,err:=client.Workspace(ctx,workspaceID)
@@ -304,6 +304,13 @@ func MustTransitionWorkspace(t *testing.T, client *codersdk.Client, workspaceID
304304

305305
_=coderdtest.AwaitWorkspaceBuildJob(t,client,build.ID)
306306

307-
updated:=coderdtest.MustWorkspace(t,client,workspace.ID)
307+
updated:=mustWorkspace(t,client,workspace.ID)
308308
require.Equal(t,to,updated.LatestBuild.Transition,"expected workspace to be in state %s but got %s",to,updated.LatestBuild.Transition)
309309
}
310+
311+
funcmustWorkspace(t*testing.T,client*codersdk.Client,workspaceID uuid.UUID) codersdk.Workspace {
312+
ctx:=context.Background()
313+
ws,err:=client.Workspace(ctx,workspaceID)
314+
require.NoError(t,err,"no workspace found with id %s",workspaceID)
315+
returnws
316+
}

‎coderd/coderdtest/coderdtest.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -508,10 +508,3 @@ type roundTripper func(req *http.Request) (*http.Response, error)
508508
func (rroundTripper)RoundTrip(req*http.Request) (*http.Response,error) {
509509
returnr(req)
510510
}
511-
512-
funcMustWorkspace(t*testing.T,client*codersdk.Client,workspaceID uuid.UUID) codersdk.Workspace {
513-
ctx:=context.Background()
514-
ws,err:=client.Workspace(ctx,workspaceID)
515-
require.NoError(t,err,"no workspace found with id %s",workspaceID)
516-
returnws
517-
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp