From 54ad4582e25c5e457f2e90b3aeda14362d9728e4 Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Fri, 27 Jun 2014 15:29:13 -0700 Subject: [PATCH] Fix unstable map ordering issue in test --- pkg/kubelet/kubelet_test.go | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 047ccd09d4b..79bca4b8233 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -436,10 +436,17 @@ func TestSyncManifestsDeletes(t *testing.T) { err := kubelet.SyncManifests([]api.ContainerManifest{}) expectNoError(t, err) verifyCalls(t, fakeDocker, []string{"list", "stop", "stop"}) + + // A map interation is used to delete containers, so must not depend on + // order here. + expectedToStop := map[string]bool{ + "1234": true, + "9876": true, + } if len(fakeDocker.stopped) != 2 || - fakeDocker.stopped[0] != "1234" || - fakeDocker.stopped[1] != "9876" { - t.Errorf("Unexpected sequence of stopped containers: %s", fakeDocker.stopped) + !expectedToStop[fakeDocker.stopped[0]] || + !expectedToStop[fakeDocker.stopped[1]] { + t.Errorf("Wrong containers were stopped: %v", fakeDocker.stopped) } }