Fix Race Condition in TestXfrmMonitorExpire

yyd01245 · Jan 4, 2019 · 48a75e0 · 48a75e0
1 parent e37f4b4
commit 48a75e0
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/xfrm_monitor_test.go b/xfrm_monitor_test.go
@@ -27,13 +27,24 @@ func TestXfrmMonitorExpire(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	hardFound := false
+	softFound := false
+
 	msg := (<-ch).(*XfrmMsgExpire)
-	if msg.XfrmState.Spi != state.Spi || msg.Hard {
-		t.Fatal("Received unexpected msg")
+	if msg.XfrmState.Spi != state.Spi {
+		t.Fatal("Received unexpected msg, spi does not match")
 	}
+	hardFound = msg.Hard || hardFound
+	softFound = !msg.Hard || softFound
 
 	msg = (<-ch).(*XfrmMsgExpire)
-	if msg.XfrmState.Spi != state.Spi || !msg.Hard {
-		t.Fatal("Received unexpected msg")
+	if msg.XfrmState.Spi != state.Spi {
+		t.Fatal("Received unexpected msg, spi does not match")
+	}
+	hardFound = msg.Hard || hardFound
+	softFound = !msg.Hard || softFound
+
+	if !hardFound || !softFound {
+		t.Fatal("Missing expire msg: hard found:", hardFound, "soft found:", softFound)
 	}
 }