github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #56480 from CaoShuFeng/schedule_queue

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 56480, 56675, 56624, 56648, 56658). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

fix scheduling queue unit test

This change makes sure the Pop() test finish completely.

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue 2017-12-16 03:24:40 -08:00 committed by GitHub
commit a99fdfc680
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/pkg/scheduler/core/scheduling_queue_test.go
View File

@ -18,6 +18,7 @@ package core
import ( import (
"reflect" "reflect"
"sync"
"testing" "testing"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
@ -87,12 +88,16 @@ func TestPriorityQueue_Add(t *testing.T) {
func TestPriorityQueue_Pop(t *testing.T) { func TestPriorityQueue_Pop(t *testing.T) {
q := NewPriorityQueue() q := NewPriorityQueue()
wg := sync.WaitGroup{}
wg.Add(1)
go func() { go func() {
defer wg.Done()
if p, err := q.Pop(); err != nil || p != &highPriorityPod { if p, err := q.Pop(); err != nil || p != &highPriorityPod {
t.Errorf("Expected: %v after Pop, but got: %v", highPriorityPod.Name, p.Name) t.Errorf("Expected: %v after Pop, but got: %v", highPriorityPod.Name, p.Name)
} }
}() }()
q.Add(&highPriorityPod) q.Add(&highPriorityPod)
wg.Wait()
} }
func TestPriorityQueue_Update(t *testing.T) { func TestPriorityQueue_Update(t *testing.T) {