Fix tests

hashicorp · May 1, 2017 · 741a71e · 741a71e
1 parent badabff
commit 741a71e
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 6 deletions.
diff --git a/scheduler/context_test.go b/scheduler/context_test.go
@@ -53,11 +53,13 @@ func TestEvalContext_ProposedAlloc(t *testing.T) {
 	}
 
 	// Add existing allocations
+	j1, j2 := mock.Job(), mock.Job()
 	alloc1 := &structs.Allocation{
 		ID:     structs.GenerateUUID(),
 		EvalID: structs.GenerateUUID(),
 		NodeID: nodes[0].Node.ID,
-		JobID:  structs.GenerateUUID(),
+		JobID:  j1.ID,
+		Job:    j1,
 		Resources: &structs.Resources{
 			CPU:      2048,
 			MemoryMB: 2048,
@@ -70,7 +72,8 @@ func TestEvalContext_ProposedAlloc(t *testing.T) {
 		ID:     structs.GenerateUUID(),
 		EvalID: structs.GenerateUUID(),
 		NodeID: nodes[1].Node.ID,
-		JobID:  structs.GenerateUUID(),
+		JobID:  j2.ID,
+		Job:    j2,
 		Resources: &structs.Resources{
 			CPU:      1024,
 			MemoryMB: 1024,

diff --git a/scheduler/feasible_test.go b/scheduler/feasible_test.go
@@ -463,27 +463,31 @@ func TestDistinctHostsIterator_JobDistinctHosts(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 		},
 
 		// Should be ignored as it is a different job.
 		&structs.Allocation{
 			TaskGroup: tg2.Name,
 			JobID:     "ignore 2",
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 		},
 	}
 	plan.NodeAllocation[nodes[1].ID] = []*structs.Allocation{
 		&structs.Allocation{
 			TaskGroup: tg2.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 		},
 
 		// Should be ignored as it is a different job.
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     "ignore 2",
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 		},
 	}
@@ -658,6 +662,7 @@ func TestDistinctPropertyIterator_JobDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        alloc1ID,
 			NodeID:    nodes[0].ID,
 		},
@@ -666,6 +671,7 @@ func TestDistinctPropertyIterator_JobDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg2.Name,
 			JobID:     "ignore 2",
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			NodeID:    nodes[0].ID,
 		},
@@ -674,6 +680,7 @@ func TestDistinctPropertyIterator_JobDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg2.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			NodeID:    nodes[2].ID,
 		},
@@ -682,6 +689,7 @@ func TestDistinctPropertyIterator_JobDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     "ignore 2",
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			NodeID:    nodes[2].ID,
 		},
@@ -693,6 +701,7 @@ func TestDistinctPropertyIterator_JobDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg2.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        stoppingAllocID,
 			NodeID:    nodes[4].ID,
 		},
@@ -704,6 +713,7 @@ func TestDistinctPropertyIterator_JobDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        alloc1ID,
 			EvalID:    structs.GenerateUUID(),
 			NodeID:    nodes[0].ID,
@@ -712,6 +722,7 @@ func TestDistinctPropertyIterator_JobDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			EvalID:    structs.GenerateUUID(),
 			NodeID:    nodes[1].ID,
@@ -721,13 +732,15 @@ func TestDistinctPropertyIterator_JobDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg2.Name,
 			JobID:     "ignore 2",
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			EvalID:    structs.GenerateUUID(),
 			NodeID:    nodes[1].ID,
 		},
 		&structs.Allocation{
 			TaskGroup: tg2.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			EvalID:    structs.GenerateUUID(),
 			NodeID:    nodes[3].ID,
@@ -737,13 +750,15 @@ func TestDistinctPropertyIterator_JobDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     "ignore 2",
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			EvalID:    structs.GenerateUUID(),
 			NodeID:    nodes[3].ID,
 		},
 		&structs.Allocation{
 			TaskGroup: tg2.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        stoppingAllocID,
 			EvalID:    structs.GenerateUUID(),
 			NodeID:    nodes[4].ID,
@@ -803,6 +818,7 @@ func TestDistinctPropertyIterator_JobDistinctProperty_RemoveAndReplace(t *testin
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			NodeID:    nodes[0].ID,
 		},
@@ -813,6 +829,7 @@ func TestDistinctPropertyIterator_JobDistinctProperty_RemoveAndReplace(t *testin
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        stoppingAllocID,
 			NodeID:    nodes[0].ID,
 		},
@@ -822,6 +839,7 @@ func TestDistinctPropertyIterator_JobDistinctProperty_RemoveAndReplace(t *testin
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        stoppingAllocID,
 			EvalID:    structs.GenerateUUID(),
 			NodeID:    nodes[0].ID,
@@ -886,6 +904,7 @@ func TestDistinctPropertyIterator_JobDistinctProperty_Infeasible(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			NodeID:    nodes[0].ID,
 		},
@@ -894,6 +913,7 @@ func TestDistinctPropertyIterator_JobDistinctProperty_Infeasible(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg2.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			EvalID:    structs.GenerateUUID(),
 			NodeID:    nodes[1].ID,
@@ -961,6 +981,7 @@ func TestDistinctPropertyIterator_TaskGroupDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			NodeID:    nodes[0].ID,
 		},
@@ -972,6 +993,7 @@ func TestDistinctPropertyIterator_TaskGroupDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        stoppingAllocID,
 			NodeID:    nodes[2].ID,
 		},
@@ -981,6 +1003,7 @@ func TestDistinctPropertyIterator_TaskGroupDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			EvalID:    structs.GenerateUUID(),
 			NodeID:    nodes[1].ID,
@@ -990,6 +1013,7 @@ func TestDistinctPropertyIterator_TaskGroupDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     "ignore 2",
+			Job:       job,
 			ID:        structs.GenerateUUID(),
 			EvalID:    structs.GenerateUUID(),
 			NodeID:    nodes[2].ID,
@@ -998,6 +1022,7 @@ func TestDistinctPropertyIterator_TaskGroupDistinctProperty(t *testing.T) {
 		&structs.Allocation{
 			TaskGroup: tg1.Name,
 			JobID:     job.ID,
+			Job:       job,
 			ID:        stoppingAllocID,
 			EvalID:    structs.GenerateUUID(),
 			NodeID:    nodes[2].ID,

diff --git a/scheduler/rank_test.go b/scheduler/rank_test.go
@@ -202,11 +202,13 @@ func TestBinPackIterator_ExistingAlloc(t *testing.T) {
 	static := NewStaticRankIterator(ctx, nodes)
 
 	// Add existing allocations
+	j1, j2 := mock.Job(), mock.Job()
 	alloc1 := &structs.Allocation{
 		ID:     structs.GenerateUUID(),
 		EvalID: structs.GenerateUUID(),
 		NodeID: nodes[0].Node.ID,
-		JobID:  structs.GenerateUUID(),
+		JobID:  j1.ID,
+		Job:    j1,
 		Resources: &structs.Resources{
 			CPU:      2048,
 			MemoryMB: 2048,
@@ -219,7 +221,8 @@ func TestBinPackIterator_ExistingAlloc(t *testing.T) {
 		ID:     structs.GenerateUUID(),
 		EvalID: structs.GenerateUUID(),
 		NodeID: nodes[1].Node.ID,
-		JobID:  structs.GenerateUUID(),
+		JobID:  j2.ID,
+		Job:    j2,
 		Resources: &structs.Resources{
 			CPU:      1024,
 			MemoryMB: 1024,
@@ -286,11 +289,13 @@ func TestBinPackIterator_ExistingAlloc_PlannedEvict(t *testing.T) {
 	static := NewStaticRankIterator(ctx, nodes)
 
 	// Add existing allocations
+	j1, j2 := mock.Job(), mock.Job()
 	alloc1 := &structs.Allocation{
 		ID:     structs.GenerateUUID(),
 		EvalID: structs.GenerateUUID(),
 		NodeID: nodes[0].Node.ID,
-		JobID:  structs.GenerateUUID(),
+		JobID:  j1.ID,
+		Job:    j1,
 		Resources: &structs.Resources{
 			CPU:      2048,
 			MemoryMB: 2048,
@@ -303,7 +308,8 @@ func TestBinPackIterator_ExistingAlloc_PlannedEvict(t *testing.T) {
 		ID:     structs.GenerateUUID(),
 		EvalID: structs.GenerateUUID(),
 		NodeID: nodes[1].Node.ID,
-		JobID:  structs.GenerateUUID(),
+		JobID:  j2.ID,
+		Job:    j2,
 		Resources: &structs.Resources{
 			CPU:      1024,
 			MemoryMB: 1024,