fix race in drain integration tests

hashicorp · Mar 20, 2018 · 914fa88 · 914fa88
1 parent 94fb0c0
commit 914fa88
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/nomad/drainer_int_test.go b/nomad/drainer_int_test.go
@@ -60,7 +60,13 @@ func allocPromoter(t *testing.T, ctx context.Context,
 			WriteRequest: structs.WriteRequest{Region: "global"},
 		}
 		var resp structs.NodeAllocsResponse
-		require.Nil(t, msgpackrpc.CallWithCodec(codec, "Node.UpdateAlloc", req, &resp))
+		if err := msgpackrpc.CallWithCodec(codec, "Node.UpdateAlloc", req, &resp); err != nil {
+			if ctx.Err() == context.Canceled {
+				return
+			} else {
+				require.Nil(t, err)
+			}
+		}
 	}
 }