Drain ctrie iterator in test

tylertreat-wf · tylertreat-wf · commit 2399f9a867c0 · 2015-07-07T11:07:24.000-05:00
diff --git a/trie/ctrie/ctrie_test.go b/trie/ctrie/ctrie_test.go
@@ -291,7 +291,11 @@ func TestIterator(t *testing.T) {
 		assert.Equal(exp, entry.Value)
 	}
 	close(cancel)
-	<-iter // Drain anything already put on the channel
+	// Drain anything already put on the channel. Since select chooses a
+	// pseudo-random case, we must attempt to drain for every item.
+	for i := 0; i < 10; i++ {
+		<-iter
+	}
 	_, ok = <-iter
 	assert.False(ok)
 }

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,11 @@ func TestIterator(t *testing.T) {`
`291`	`291`	`assert.Equal(exp, entry.Value)`
`292`	`292`	`}`
`293`	`293`	`close(cancel)`
`294`		`- <-iter // Drain anything already put on the channel`
	`294`	`+ // Drain anything already put on the channel. Since select chooses a`
	`295`	`+ // pseudo-random case, we must attempt to drain for every item.`
	`296`	`+ for i := 0; i < 10; i++ {`
	`297`	`+ <-iter`
	`298`	`+ }`
`295`	`299`	`_, ok = <-iter`
`296`	`300`	`assert.False(ok)`
`297`	`301`	`}`