tests: use future::join instead of future::select (#2813)

* tests/av-store: use future::join instead of future::select

* tests/backing: use future::join instead of future::select

* tests/provisioner: use future::join instead of future::select

* tests/av-dist: use future::join instead of future::select

* tests/av-recovery: use future::join instead of future::select

* tests/bridge: use future::join instead of future::select

* tests/collator-protocol: use future::join instead of future::select

* tests/stmt-dist: use future::join instead of future::select

* fix tests

polkadot/node/network/bridge/src/lib.rs

@@ -1365,12 +1365,14 @@ mod tests {
 		Box::new(oracle)
 	}
 
+	type VirtualOverseer = TestSubsystemContextHandle<NetworkBridgeMessage>;
+
 	struct TestHarness {
 		network_handle: TestNetworkHandle,
-		virtual_overseer: TestSubsystemContextHandle<NetworkBridgeMessage>,
+		virtual_overseer: VirtualOverseer,
 	}
 
-	fn test_harness<T: Future<Output=()>>(
+	fn test_harness<T: Future<Output=VirtualOverseer>>(
 		sync_oracle: Box<dyn SyncOracle + Send>,
 		test: impl FnOnce(TestHarness) -> T,
 	) {
@@ -1402,7 +1404,10 @@ mod tests {
 		futures::pin_mut!(test_fut);
 		futures::pin_mut!(network_bridge);
 
-		let _ = executor::block_on(future::select(test_fut, network_bridge));
+		let _ = executor::block_on(future::join(async move {
+			let mut virtual_overseer = test_fut.await;
+			virtual_overseer.send(FromOverseer::Signal(OverseerSignal::Conclude)).await;
+		}, network_bridge));
 	}
 
 	async fn assert_sends_validation_event_to_all(
@@ -1494,6 +1499,7 @@ mod tests {
 					).encode(),
 				),
 			);
+			virtual_overseer
 		});
 	}
 
@@ -1585,6 +1591,7 @@ mod tests {
 					wire_message.clone(),
 				),
 			);
+			virtual_overseer
 		});
 	}
 
@@ -1688,6 +1695,7 @@ mod tests {
 					),
 				);
 			}
+			virtual_overseer
 		});
 	}
 
@@ -1754,6 +1762,7 @@ mod tests {
 					wire_message.clone(),
 				),
 			);
+			virtual_overseer
 		});
 	}
 
@@ -1796,6 +1805,7 @@ mod tests {
 				NetworkBridgeEvent::PeerViewChange(peer.clone(), view),
 				&mut virtual_overseer,
 			).await;
+			virtual_overseer
 		});
 	}
 
@@ -1863,6 +1873,7 @@ mod tests {
 				NetworkBridgeEvent::PeerDisconnected(peer),
 				&mut virtual_overseer,
 			).await;
+			virtual_overseer
 		});
 	}
 
@@ -1938,6 +1949,7 @@ mod tests {
 					wire_message.clone(),
 				),
 			);
+			virtual_overseer
 		});
 	}
 
@@ -2026,6 +2038,7 @@ mod tests {
 					assert_eq!(m, collator_protocol_message);
 				}
 			);
+			virtual_overseer
 		});
 	}
 
@@ -2091,6 +2104,7 @@ mod tests {
 				NetworkBridgeEvent::PeerViewChange(peer.clone(), view_b.clone()),
 				&mut virtual_overseer,
 			).await;
+			virtual_overseer
 		});
 	}
 
@@ -2136,13 +2150,14 @@ mod tests {
 					wire_message.clone(),
 				),
 			);
+			virtual_overseer
 		});
 	}
 
 	#[test]
 	fn view_finalized_number_can_not_go_down() {
 		test_harness(done_syncing_oracle(), |test_harness| async move {
-			let TestHarness { mut network_handle, .. } = test_harness;
+			let TestHarness { mut network_handle, virtual_overseer } = test_harness;
 
 			let peer_a = PeerId::random();
 
@@ -2176,6 +2191,7 @@ mod tests {
 					MALFORMED_VIEW_COST,
 				),
 			);
+			virtual_overseer
 		});
 	}
 
@@ -2279,6 +2295,7 @@ mod tests {
 					)
 				);
 			}
+			virtual_overseer
 		});
 	}
 
@@ -2361,6 +2378,7 @@ mod tests {
 				NetworkBridgeEvent::OurViewChange(our_view),
 				&mut virtual_overseer,
 			).await;
+			virtual_overseer
 		});
 	}
 }