make test deterministic be expecting all messages

adamsmo · adamsmo · commit e067254014ca · 2017-08-01T21:26:10.000+02:00
diff --git a/src/test/scala/io/iohk/ethereum/blockchain/sync/SyncControllerSpec.scala b/src/test/scala/io/iohk/ethereum/blockchain/sync/SyncControllerSpec.scala
@@ -81,8 +81,10 @@ class SyncControllerSpec extends FlatSpec with Matchers {
     )
     etcPeerManager.expectNoMsg()
 
-    peerMessageBus.expectMsg(Subscribe(MessageClassifier(Set(BlockHeaders.code), PeerSelector.WithId(peer2.id))))
-    peerMessageBus.expectMsg(Subscribe(MessageClassifier(Set(NodeData.code), PeerSelector.WithId(peer1.id))))
+    peerMessageBus.expectMsgAllOf(
+      Subscribe(MessageClassifier(Set(BlockHeaders.code), PeerSelector.WithId(peer2.id))),
+      Subscribe(MessageClassifier(Set(NodeData.code), PeerSelector.WithId(peer1.id)))
+    )
   }
 
   it should "download target block, request state, blocks and finish when downloaded" in new TestSetup() {

Original file line number	Diff line number	Diff line change
`@@ -81,8 +81,10 @@ class SyncControllerSpec extends FlatSpec with Matchers {`
`81`	`81`	`)`
`82`	`82`	`etcPeerManager.expectNoMsg()`
`83`	`83`
`84`		`- peerMessageBus.expectMsg(Subscribe(MessageClassifier(Set(BlockHeaders.code), PeerSelector.WithId(peer2.id))))`
`85`		`- peerMessageBus.expectMsg(Subscribe(MessageClassifier(Set(NodeData.code), PeerSelector.WithId(peer1.id))))`
	`84`	`+ peerMessageBus.expectMsgAllOf(`
	`85`	`+ Subscribe(MessageClassifier(Set(BlockHeaders.code), PeerSelector.WithId(peer2.id))),`
	`86`	`+ Subscribe(MessageClassifier(Set(NodeData.code), PeerSelector.WithId(peer1.id)))`
	`87`	`+ )`
`86`	`88`	`}`
`87`	`89`
`88`	`90`	`it should "download target block, request state, blocks and finish when downloaded" in new TestSetup() {`