Merge branch 'fix' into 'master'

[Issue volcano-sh#63]fix action UT as add new action enqueue, allocate/preempt/reclaim UT go failed, fix~ Issues info: Issue ID: 63 Title: sync code from github / 190422 Issue url: CBU-PaaS/Community/volcano/volcano#63 See merge request CBU-PaaS/Community/volcano/volcano!108
wangyuqing4 · Apr 24, 2019 · 9a8e67e · 9a8e67e
2 parents 079feb4 + 8dadc16
commit 9a8e67e
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/pkg/scheduler/actions/allocate/allocate_test.go b/pkg/scheduler/actions/allocate/allocate_test.go
@@ -59,6 +59,9 @@ func TestAllocate(t *testing.T) {
 					Spec: kbv1.PodGroupSpec{
 						Queue: "c1",
 					},
+					Status: kbv1.PodGroupStatus{
+						Phase: kbv1.PodGroupInqueue,
+					},
 				},
 			},
 			pods: []*v1.Pod{
@@ -94,6 +97,9 @@ func TestAllocate(t *testing.T) {
 					Spec: kbv1.PodGroupSpec{
 						Queue: "c1",
 					},
+					Status: kbv1.PodGroupStatus{
+						Phase: kbv1.PodGroupInqueue,
+					},
 				},
 				{
 					ObjectMeta: metav1.ObjectMeta{
@@ -103,6 +109,9 @@ func TestAllocate(t *testing.T) {
 					Spec: kbv1.PodGroupSpec{
 						Queue: "c2",
 					},
+					Status: kbv1.PodGroupStatus{
+						Phase: kbv1.PodGroupInqueue,
+					},
 				},
 			},
 

diff --git a/pkg/scheduler/actions/preempt/preempt_test.go b/pkg/scheduler/actions/preempt/preempt_test.go
@@ -58,6 +58,9 @@ func TestPreempt(t *testing.T) {
 					Spec: kbv1.PodGroupSpec{
 						Queue: "q1",
 					},
+					Status: kbv1.PodGroupStatus{
+						Phase: kbv1.PodGroupInqueue,
+					},
 				},
 			},
 			pods: []*v1.Pod{
@@ -92,6 +95,9 @@ func TestPreempt(t *testing.T) {
 					Spec: kbv1.PodGroupSpec{
 						Queue: "q1",
 					},
+					Status: kbv1.PodGroupStatus{
+						Phase: kbv1.PodGroupInqueue,
+					},
 				},
 				{
 					ObjectMeta: metav1.ObjectMeta{
@@ -101,6 +107,9 @@ func TestPreempt(t *testing.T) {
 					Spec: kbv1.PodGroupSpec{
 						Queue: "q1",
 					},
+					Status: kbv1.PodGroupStatus{
+						Phase: kbv1.PodGroupInqueue,
+					},
 				},
 			},
 

diff --git a/pkg/scheduler/actions/reclaim/reclaim_test.go b/pkg/scheduler/actions/reclaim/reclaim_test.go
@@ -58,6 +58,9 @@ func TestReclaim(t *testing.T) {
 					Spec: kbv1.PodGroupSpec{
 						Queue: "q1",
 					},
+					Status: kbv1.PodGroupStatus{
+						Phase: kbv1.PodGroupInqueue,
+					},
 				},
 				{
 					ObjectMeta: metav1.ObjectMeta{
@@ -67,6 +70,9 @@ func TestReclaim(t *testing.T) {
 					Spec: kbv1.PodGroupSpec{
 						Queue: "q2",
 					},
+					Status: kbv1.PodGroupStatus{
+						Phase: kbv1.PodGroupInqueue,
+					},
 				},
 			},
 			pods: []*v1.Pod{