Skip to content

Commit ad2f546

Browse files
committed
clean up dispatch test
1 parent 92e4b0c commit ad2f546

File tree

1 file changed

+16
-10
lines changed

1 file changed

+16
-10
lines changed

command/job_dispatch_test.go

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ func TestJobDispatchCommand_ACL(t *testing.T) {
105105
job := mock.MinJob()
106106
job.Type = "batch"
107107
job.ParameterizedJob = &structs.ParameterizedJobConfig{}
108+
job.Priority = 20 //set priority on parent job
108109
state := srv.Agent.Server().State()
109110
err := state.UpsertJob(structs.MsgTypeTestSetup, 100, nil, job)
110111
must.NoError(t, err)
@@ -214,7 +215,7 @@ namespace "default" {
214215

215216
func TestJobDispatchCommand_Priority(t *testing.T) {
216217
ci.Parallel(t)
217-
218+
defaultJobPriority := 50
218219
// Start server
219220
srv, client, url := testServer(t, true, nil)
220221
t.Cleanup(srv.Shutdown)
@@ -225,6 +226,7 @@ func TestJobDispatchCommand_Priority(t *testing.T) {
225226
job := mock.MinJob()
226227
job.Type = "batch"
227228
job.ParameterizedJob = &structs.ParameterizedJobConfig{}
229+
job.Priority = defaultJobPriority // set default priority on parent job
228230
state := srv.Agent.Server().State()
229231
err := state.UpsertJob(structs.MsgTypeTestSetup, 100, nil, job)
230232
must.NoError(t, err)
@@ -237,18 +239,16 @@ func TestJobDispatchCommand_Priority(t *testing.T) {
237239
payload map[string]string
238240
}{
239241
{
240-
name: "one flag",
241-
priority: "50",
242+
name: "no priority",
242243
},
243244
{
244-
name: "two flags",
245-
priority: "30",
246-
additionalFlags: []string{"-verbose"},
245+
name: "only priority",
246+
priority: "80",
247247
},
248248
{
249-
name: "three flags",
250-
priority: "20",
251-
additionalFlags: []string{"-verbose", "-detach"},
249+
name: "priority + flag",
250+
priority: "90",
251+
additionalFlags: []string{"-verbose"},
252252
},
253253
}
254254

@@ -278,8 +278,14 @@ func TestJobDispatchCommand_Priority(t *testing.T) {
278278
must.Zero(t, code)
279279
}
280280

281+
// Confirm successful dispatch and parse job ID
282+
out := ui.OutputWriter.String()
283+
must.StrContains(t, out, "Dispatched Job ID =")
284+
parts := strings.Fields(out)
285+
id := strings.TrimSpace(parts[4])
286+
281287
// Confirm dispatched job priority set correctly
282-
job, _, err := client.Jobs().List(nil)
288+
job, _, err := client.Jobs().Info(id, nil)
283289
must.NoError(t, err)
284290
must.NotNil(t, job)
285291

0 commit comments

Comments
 (0)