Merge pull request #6210 from gyuho/race

integration: fix race in TestDoubleBarrierFailover
etcd-io · Aug 17, 2016 · 14f6dd4 · 14f6dd4
2 parents 57fde95 + 10c9e23
commit 14f6dd4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/integration/v3_double_barrier_test.go b/integration/v3_double_barrier_test.go
@@ -114,17 +114,17 @@ func TestDoubleBarrierFailover(t *testing.T) {
 	// sacrificial barrier holder; lease will be revoked
 	go func() {
 		b := recipe.NewDoubleBarrier(s0, "test-barrier", waiters)
-		if err = b.Enter(); err != nil {
-			t.Fatalf("could not enter on barrier (%v)", err)
+		if berr := b.Enter(); berr != nil {
+			t.Fatalf("could not enter on barrier (%v)", berr)
 		}
 		donec <- struct{}{}
 	}()
 
 	for i := 0; i < waiters-1; i++ {
 		go func() {
 			b := recipe.NewDoubleBarrier(s1, "test-barrier", waiters)
-			if err = b.Enter(); err != nil {
-				t.Fatalf("could not enter on barrier (%v)", err)
+			if berr := b.Enter(); berr != nil {
+				t.Fatalf("could not enter on barrier (%v)", berr)
 			}
 			donec <- struct{}{}
 			b.Leave()