luxolus/open-nomad
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Fixing the scheduler tests

Browse source
This commit is contained in:
Diptanu Choudhury 2015-11-14 22:28:11 -08:00 committed by Alex Dadgar
parent 69efc89436
commit babc68adfb
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scheduler/generic_sched_test.go
View file

@ -397,9 +397,10 @@ func TestServiceSched_JobModify_InPlace(t *testing.T) {
h.AssertEvalStatus(t, structs.EvalStatusComplete) h.AssertEvalStatus(t, structs.EvalStatusComplete)
// Verify the network did not change // Verify the network did not change
rp := structs.Port{"main", 5000}
for _, alloc := range out { for _, alloc := range out {
for _, resources := range alloc.TaskResources { for _, resources := range alloc.TaskResources {
if resources.Networks[0].ReservedPorts[0] != 5000 { if resources.Networks[0].ReservedPorts[0] != rp {
t.Fatalf("bad: %#v", alloc) t.Fatalf("bad: %#v", alloc)
} }
} }

3
scheduler/system_sched_test.go
View file

@ -463,9 +463,10 @@ func TestSystemSched_JobModify_InPlace(t *testing.T) {
h.AssertEvalStatus(t, structs.EvalStatusComplete) h.AssertEvalStatus(t, structs.EvalStatusComplete)
// Verify the network did not change // Verify the network did not change
rp := structs.Port{"main", 5000}
for _, alloc := range out { for _, alloc := range out {
for _, resources := range alloc.TaskResources { for _, resources := range alloc.TaskResources {
if resources.Networks[0].ReservedPorts[0] != 5000 { if resources.Networks[0].ReservedPorts[0] != rp {
t.Fatalf("bad: %#v", alloc) t.Fatalf("bad: %#v", alloc)
} }
} }

2
scheduler/util_test.go
View file

@ -343,7 +343,7 @@ func TestTasksUpdated(t *testing.T) {
} }
j6 := mock.Job() j6 := mock.Job()
j6.TaskGroups[0].Tasks[0].Resources.Networks[0].DynamicPorts = []string{"http", "https", "admin"} j6.TaskGroups[0].Tasks[0].Resources.Networks[0].DynamicPorts = []structs.Port{{"http", 0}, {"https", 0}, {"admin", 0}}
if !tasksUpdated(j1.TaskGroups[0], j6.TaskGroups[0]) { if !tasksUpdated(j1.TaskGroups[0], j6.TaskGroups[0]) {
t.Fatalf("bad") t.Fatalf("bad")
} }