Improve tests; try to fix CI

node/service/Cargo.toml

@@ -145,6 +145,7 @@ polkadot-test-client = { path = "../test/client" }
 polkadot-node-subsystem-test-helpers = { path = "../subsystem-test-helpers" }
 env_logger = "0.9.0"
 assert_matches = "1.5.0"
+serial_test = "2.0.0"
 tempfile = "3.2"
 
 [build-dependencies]

node/service/src/lib.rs

@@ -1409,6 +1409,7 @@ mod workers {
 		use super::*;
 
 		use assert_matches::assert_matches;
+		use serial_test::serial;
 		use std::{env::temp_dir, fs, os::unix::fs::PermissionsExt, path::Path};
 
 		const NODE_VERSION: &'static str = env!("SUBSTRATE_CLI_IMPL_VERSION");
@@ -1452,10 +1453,6 @@ echo {}
 		fn with_temp_dir_structure(
 			f: impl FnOnce(PathBuf) -> Result<(), Box<dyn std::error::Error>>,
 		) -> Result<(), Box<dyn std::error::Error>> {
-			// Ensure tests run one at a time so they don't interfere with each other.
-			static OVERRIDES_LOCK: Mutex<()> = Mutex::new(());
-			let _lock = OVERRIDES_LOCK.lock()?;
-
 			// Set up <tmp>/usr/lib/polkadot and <tmp>/usr/bin, both empty.
 
 			let tempdir = temp_dir();
@@ -1478,6 +1475,7 @@ echo {}
 		}
 
 		#[test]
+		#[serial]
 		fn test_given_worker_path() {
 			with_temp_dir_structure(|tempdir| {
 				let given_workers_path = tempdir.join("usr/local/bin");
@@ -1522,6 +1520,7 @@ echo {}
 		}
 
 		#[test]
+		#[serial]
 		fn missing_workers_paths_throws_error() {
 			with_temp_dir_structure(|tempdir| {
 				// Try with both binaries missing.
@@ -1571,6 +1570,7 @@ echo {}
 		}
 
 		#[test]
+		#[serial]
 		fn should_find_workers_at_all_locations() {
 			with_temp_dir_structure(|tempdir| {
 				let prepare_worker_bin_path = tempdir.join("usr/bin/polkadot-prepare-worker");
@@ -1596,6 +1596,7 @@ echo {}
 		}
 
 		#[test]
+		#[serial]
 		fn workers_version_mismatch_throws_error() {
 			let bad_version = "v9.9.9.9";
 
@@ -1645,6 +1646,7 @@ echo {}
 		}
 
 		#[test]
+		#[serial]
 		fn should_find_valid_workers() {
 			// Test bin location.
 			with_temp_dir_structure(|tempdir| {

parachain/test-parachains/adder/collator/src/main.rs

@@ -58,17 +58,19 @@ fn main() -> Result<()> {
 
 				let full_node = polkadot_service::build_full(
 					config,
-					polkadot_service::IsCollator::Yes(collator.collator_key()),
-					None,
-					false,
-					None,
-					None,
-					None,
-					false,
-					polkadot_service::RealOverseerGen,
-					None,
-					None,
-					None,
+					polkadot_service::NewFullParams {
+						is_collator: polkadot_service::IsCollator::Yes(collator.collator_key()),
+						grandpa_pause: None,
+						enable_beefy: false,
+						jaeger_agent: None,
+						telemetry_worker_handle: None,
+						workers_path: None,
+						overseer_enable_anyways: false,
+						overseer_gen: polkadot_service::RealOverseerGen,
+						overseer_message_channel_capacity_override: None,
+						malus_finality_delay: None,
+						hwbench: None,
+					},
 				)
 				.map_err(|e| e.to_string())?;
 				let mut overseer_handle = full_node

parachain/test-parachains/undying/collator/src/main.rs

@@ -58,17 +58,19 @@ fn main() -> Result<()> {
 
 				let full_node = polkadot_service::build_full(
 					config,
-					polkadot_service::IsCollator::Yes(collator.collator_key()),
-					None,
-					false,
-					None,
-					None,
-					None,
-					false,
-					polkadot_service::RealOverseerGen,
-					None,
-					None,
-					None,
+					polkadot_service::NewFullParams {
+						is_collator: polkadot_service::IsCollator::Yes(collator.collator_key()),
+						grandpa_pause: None,
+						enable_beefy: false,
+						jaeger_agent: None,
+						telemetry_worker_handle: None,
+						workers_path: None,
+						overseer_enable_anyways: false,
+						overseer_gen: polkadot_service::RealOverseerGen,
+						overseer_message_channel_capacity_override: None,
+						malus_finality_delay: None,
+						hwbench: None,
+					},
 				)
 				.map_err(|e| e.to_string())?;
 				let mut overseer_handle = full_node