Browse Source

integration: fix race in TestDoubleBarrierFailover

Gyu-Ho Lee 9 years ago
parent
commit
10c9e238f0
1 changed files with 4 additions and 4 deletions
  1. 4 4
      integration/v3_double_barrier_test.go

+ 4 - 4
integration/v3_double_barrier_test.go

@@ -114,8 +114,8 @@ func TestDoubleBarrierFailover(t *testing.T) {
 	// sacrificial barrier holder; lease will be revoked
 	// sacrificial barrier holder; lease will be revoked
 	go func() {
 	go func() {
 		b := recipe.NewDoubleBarrier(s0, "test-barrier", waiters)
 		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{}{}
 		donec <- struct{}{}
 	}()
 	}()
@@ -123,8 +123,8 @@ func TestDoubleBarrierFailover(t *testing.T) {
 	for i := 0; i < waiters-1; i++ {
 	for i := 0; i < waiters-1; i++ {
 		go func() {
 		go func() {
 			b := recipe.NewDoubleBarrier(s1, "test-barrier", waiters)
 			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{}{}
 			donec <- struct{}{}
 			b.Leave()
 			b.Leave()