fragile tests fix (#238)

* fragile tests fix

* more fragile test fixes

e2e/e2e_ext_test.go

@@ -744,6 +744,15 @@ func TestNewL2Keystone(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// there is a chance we get notifications from the L2KeystonesInsert
+	// call above, if they haven't been broadcast yet.  ignore those.
+	if v.Header.Command == bfgapi.CmdL2KeystonesNotification {
+		err = wsjson.Read(ctx, c, &v)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
 	if v.Header.Command != bssapi.CmdL2KeystoneResponse {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
@@ -1341,6 +1350,14 @@ func TestBitcoinInfo(t *testing.T) {
 	}
 	bitcoinInfoResponse := v.(*bfgapi.BitcoinInfoResponse)
 
+	// there is a chance we get notifications from the L2KeystonesInsert
+	// call above, if they haven't been broadcast yet.  ignore those.
+	if command == bfgapi.CmdL2KeystonesNotification {
+		err = wsjson.Read(ctx, c, &v)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
 	if command != bfgapi.CmdBitcoinInfoResponse {
 		t.Fatalf("unexpected command: %s", command)
 	}
@@ -1526,6 +1543,15 @@ func TestBitcoinBroadcast(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// there is a chance we get notifications from the L2KeystonesInsert
+	// call above, if they haven't been broadcast yet.  ignore those.
+	if command == bfgapi.CmdL2KeystonesNotification {
+		command, _, _, err = bfgapi.Read(ctx, bws.conn)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
 	if command != bfgapi.CmdBitcoinBroadcastResponse {
 		t.Fatalf("received wrong command %s", command)
 	}
@@ -2361,6 +2387,15 @@ func TestGetMostRecentL2BtcFinalitiesBSS(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// there is a chance we get notifications from the L2KeystonesInsert
+	// call above, if they haven't been broadcast yet.  ignore those.
+	if v.Header.Command == bfgapi.CmdL2KeystonesNotification {
+		err = wsjson.Read(ctx, c, &v)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
 	if v.Header.Command != bssapi.CmdBTCFinalityByRecentKeystonesResponse {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
@@ -2567,6 +2602,15 @@ func TestGetFinalitiesByL2KeystoneBSSLowerServerHeight(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// there is a chance we get notifications from the L2KeystonesInsert
+	// call above, if they haven't been broadcast yet.  ignore those.
+	if v.Header.Command == bfgapi.CmdL2KeystonesNotification {
+		err = wsjson.Read(ctx, c, &v)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
 	if v.Header.Command != bssapi.CmdBTCFinalityByKeystonesResponse {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}
@@ -2645,6 +2689,15 @@ func TestGetMostRecentL2BtcFinalitiesBFG(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// there is a chance we get notifications from the L2KeystonesInsert
+	// call above, if they haven't been broadcast yet.  ignore those.
+	if v.Header.Command == bfgapi.CmdL2KeystonesNotification {
+		err = wsjson.Read(ctx, c, &v)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+
 	if v.Header.Command != bfgapi.CmdBTCFinalityByRecentKeystonesResponse {
 		t.Fatalf("received unexpected command: %s", v.Header.Command)
 	}