Merge pull request #1260 from lavalamp/ff4

fix silly test bug

Author: eparis

mungegithub/mungers/flakesync/cache.go

@@ -198,11 +198,13 @@ func (f Flakes) Less(i, j int) bool {
 // Flakes lists all the current flakes, sorted.
 func (c *Cache) Flakes() Flakes {
 	flakes := Flakes{}
-	c.lock.Lock()
-	defer c.lock.Unlock()
-	for _, f := range c.flakeQueue {
-		flakes = append(flakes, *f)
-	}
+	func() {
+		c.lock.Lock()
+		defer c.lock.Unlock()
+		for _, f := range c.flakeQueue {
+			flakes = append(flakes, *f)
+		}
+	}()
 	sort.Sort(flakes)
 	return flakes
 }

mungegithub/mungers/flakesync/cache_test.go

@@ -43,8 +43,7 @@ func TestBasic(t *testing.T) {
 	if !reflect.DeepEqual(r1, r2) {
 		t.Errorf("expected to match: %#v, %#v", r1, r2)
 	}
-	i := 6
-	for len(c.Flakes()) == 0 {
+	for i := 0; len(c.Flakes()) == 0; i++ {
 		c.Get("foo", Number(i))
 	}
 }