fix flappy integration test

go/inst/instance_key_map.go

@@ -18,6 +18,7 @@ package inst
 
 import (
 	"encoding/json"
+	"sort"
 	"strings"
 )
 
@@ -59,6 +60,9 @@ func (this *InstanceKeyMap) GetInstanceKeys() []InstanceKey {
 	for key := range *this {
 		res = append(res, key)
 	}
+	sort.Slice(res, func(i, j int) bool {
+		return res[i].Hostname < res[j].Hostname || res[i].Hostname == res[j].Hostname && res[i].Port < res[j].Port
+	})
 	return res
 }
 

go/inst/instance_key_map_test.go

@@ -17,6 +17,7 @@
 package inst
 
 import (
+	"math/rand"
 	"testing"
 
 	"github.com/github/orchestrator/go/config"
@@ -30,6 +31,25 @@ func init() {
 	log.SetLevel(log.ERROR)
 }
 
+func TestGetInstanceKeys(t *testing.T) {
+	for range rand.Perm(10) { // Just running many iterations to cover multiple possible map iteration ordering. Perm() is just used as an array generator here.
+		m := *NewInstanceKeyMap()
+		m.AddKey(key1)
+		m.AddKey(key2)
+		keys := m.GetInstanceKeys()
+		test.S(t).ExpectEquals(keys[0], key1)
+		test.S(t).ExpectEquals(keys[1], key2)
+	}
+	for range rand.Perm(10) { // Just running many iterations to cover multiple possible map iteration ordering. Perm() is just used as an array generator here.
+		m := *NewInstanceKeyMap()
+		m.AddKey(key2)
+		m.AddKey(key1)
+		keys := m.GetInstanceKeys()
+		test.S(t).ExpectEquals(keys[0], key1)
+		test.S(t).ExpectEquals(keys[1], key2)
+	}
+}
+
 func TestInstanceKeyMapToJSON(t *testing.T) {
 	m := *NewInstanceKeyMap()
 	m.AddKey(key1)