github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #21667 from HaiyangDING/patch-3

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-22 06:52:02 -08:00
parent d089fa8030 40f6032d33
commit c533ae4dd0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet_test.go
View File

@@ -2344,7 +2344,7 @@ func TestGetHostPortConflicts(t *testing.T) {
// The new pod should cause conflict and be reported. // The new pod should cause conflict and be reported.
pods = append(pods, expected) pods = append(pods, expected)
if !hasHostPortConflicts(pods) { if !hasHostPortConflicts(pods) {
t.Errorf("expected no conflict, Got no conflicts") t.Errorf("expected conflict, Got no conflicts")
} }
} }