diff --git a/Cargo.lock b/Cargo.lock index 04b8867196..5b722f0e06 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2960,6 +2960,15 @@ dependencies = [ "regex-automata 0.1.10", ] +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "memchr" version = "2.7.2" @@ -6203,7 +6212,7 @@ dependencies = [ "ansi_term", "chrono", "lazy_static", - "matchers", + "matchers 0.0.1", "regex", "serde", "serde_json", @@ -6222,10 +6231,14 @@ version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ + "matchers 0.1.0", "nu-ansi-term", + "once_cell", + "regex", "sharded-slab", "smallvec", "thread_local", + "tracing", "tracing-core", "tracing-log 0.2.0", ] diff --git a/Cargo.toml b/Cargo.toml index 2f8d9a34d4..2ae5dcace6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -107,7 +107,7 @@ thiserror = "1.0.63" tokio = { version = "1.40", default-features = false } tracing = { version = "0.1.40", default-features = false } tracing-wasm = "0.2.1" -tracing-subscriber = "0.3.18" +tracing-subscriber = { version = "0.3.18", features = ["env-filter"] } trybuild = "1.0.99" url = "2.5.2" wabt = "0.10.0" diff --git a/testing/integration-tests/src/full_client/blocks/mod.rs b/testing/integration-tests/src/full_client/blocks/mod.rs index 4125397b21..ac436acc6a 100644 --- a/testing/integration-tests/src/full_client/blocks/mod.rs +++ b/testing/integration-tests/src/full_client/blocks/mod.rs @@ -88,7 +88,9 @@ async fn block_subscriptions_are_consistent_with_eachother() -> Result<(), subxt Ok(()) } +// TODO: flaky test https://github.com/paritytech/subxt/issues/1782. #[subxt_test] +#[ignore] async fn finalized_headers_subscription() -> Result<(), subxt::Error> { let ctx = test_context().await; let api = ctx.client(); diff --git a/testing/integration-tests/src/full_client/client/mod.rs b/testing/integration-tests/src/full_client/client/mod.rs index fa909ec9c5..0081c7eb3e 100644 --- a/testing/integration-tests/src/full_client/client/mod.rs +++ b/testing/integration-tests/src/full_client/client/mod.rs @@ -413,6 +413,7 @@ async fn partial_fee_estimate_correct() { } #[subxt_test] +#[ignore] async fn legacy_and_unstable_block_subscription_reconnect() { let ctx = test_context_reconnecting_rpc_client().await; let api = ctx.unstable_client().await; diff --git a/testing/substrate-runner/src/error.rs b/testing/substrate-runner/src/error.rs index c7179da2d0..fe3063021d 100644 --- a/testing/substrate-runner/src/error.rs +++ b/testing/substrate-runner/src/error.rs @@ -5,26 +5,26 @@ #[derive(Debug)] pub enum Error { Io(std::io::Error), - CouldNotExtractPort, - CouldNotExtractP2pAddress, - CouldNotExtractP2pPort, + CouldNotExtractPort(String), + CouldNotExtractP2pAddress(String), + CouldNotExtractP2pPort(String), } impl std::fmt::Display for Error { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { Error::Io(err) => write!(f, "IO error: {err}"), - Error::CouldNotExtractPort => write!( + Error::CouldNotExtractPort(log) => write!( f, - "could not extract port from running substrate node's stdout" + "could not extract port from running substrate node's stdout: {log}" ), - Error::CouldNotExtractP2pAddress => write!( + Error::CouldNotExtractP2pAddress(log) => write!( f, - "could not extract p2p address from running substrate node's stdout" + "could not extract p2p address from running substrate node's stdout: {log}" ), - Error::CouldNotExtractP2pPort => write!( + Error::CouldNotExtractP2pPort(log) => write!( f, - "could not extract p2p port from running substrate node's stdout" + "could not extract p2p port from running substrate node's stdout: {log}" ), } } diff --git a/testing/substrate-runner/src/lib.rs b/testing/substrate-runner/src/lib.rs index 82d3ea6258..621088ce33 100644 --- a/testing/substrate-runner/src/lib.rs +++ b/testing/substrate-runner/src/lib.rs @@ -102,11 +102,11 @@ impl SubstrateNodeBuilder { // Wait for RPC port to be logged (it's logged to stderr). let stderr = proc.stderr.take().unwrap(); - let (ws_port, p2p_address, p2p_port) = try_find_substrate_port_from_output(stderr); + let running_node = try_find_substrate_port_from_output(stderr); - let ws_port = ws_port.ok_or(Error::CouldNotExtractPort)?; - let p2p_address = p2p_address.ok_or(Error::CouldNotExtractP2pAddress)?; - let p2p_port = p2p_port.ok_or(Error::CouldNotExtractP2pPort)?; + let ws_port = running_node.ws_port()?; + let p2p_address = running_node.p2p_address()?; + let p2p_port = running_node.p2p_port()?; Ok(SubstrateNode { binary_path: bin_path, @@ -244,16 +244,19 @@ impl Drop for SubstrateNode { // Consume a stderr reader from a spawned substrate command and // locate the port number that is logged out to it. -fn try_find_substrate_port_from_output( - r: impl Read + Send + 'static, -) -> (Option, Option, Option) { +fn try_find_substrate_port_from_output(r: impl Read + Send + 'static) -> SubstrateNodeInfo { let mut port = None; let mut p2p_address = None; let mut p2p_port = None; - for line in BufReader::new(r).lines().take(50) { + let mut log = String::new(); + + for line in BufReader::new(r).lines().take(100) { let line = line.expect("failed to obtain next line from stdout for port discovery"); + log.push_str(&line); + log.push('\n'); + // Parse the port lines let line_port = line // oldest message: @@ -303,5 +306,37 @@ fn try_find_substrate_port_from_output( } } - (port, p2p_address, p2p_port) + SubstrateNodeInfo { + ws_port: port, + p2p_address, + p2p_port, + log, + } +} + +/// Data extracted from the running node's stdout. +#[derive(Debug)] +pub struct SubstrateNodeInfo { + ws_port: Option, + p2p_address: Option, + p2p_port: Option, + log: String, +} + +impl SubstrateNodeInfo { + pub fn ws_port(&self) -> Result { + self.ws_port + .ok_or_else(|| Error::CouldNotExtractPort(self.log.clone())) + } + + pub fn p2p_address(&self) -> Result { + self.p2p_address + .clone() + .ok_or_else(|| Error::CouldNotExtractP2pAddress(self.log.clone())) + } + + pub fn p2p_port(&self) -> Result { + self.p2p_port + .ok_or_else(|| Error::CouldNotExtractP2pPort(self.log.clone())) + } }