[e2e-tests][flaky test] bump network start timeout (#564)

Author: 0xsiddharthks

crates/e2e-tests/src/bitcoin_node.rs

@@ -145,28 +145,11 @@ impl BitcoinNodeHandle {
     }
 
     fn startup_diagnostics(&self) -> String {
-        let mut diagnostics = Vec::new();
-
-        for (label, path) in [
+        crate::tail_logs(&[
             ("stderr", &self.stderr_path),
             ("stdout", &self.stdout_path),
             ("debug.log", &self.data_dir.join("regtest/debug.log")),
-        ] {
-            let contents = std::fs::read_to_string(path)
-                .ok()
-                .and_then(|contents| {
-                    let lines: Vec<_> = contents.lines().rev().take(20).collect();
-                    if lines.is_empty() {
-                        None
-                    } else {
-                        Some(lines.into_iter().rev().collect::<Vec<_>>().join(" | "))
-                    }
-                })
-                .unwrap_or_else(|| format!("<empty or unavailable at {}>", path.display()));
-            diagnostics.push(format!("{label}: {contents}"));
-        }
-
-        diagnostics.join("; ")
+        ])
     }
 
     pub fn generate_blocks(&self, count: u64) -> Result<Vec<BlockHash>> {

crates/e2e-tests/src/lib.rs

@@ -40,6 +40,26 @@ use tempfile::TempDir;
 use crate::publish::publish;
 use crate::sui_network::sui_binary;
 
+/// Tail the last 20 lines of each named log file, joined into a one-line diagnostic.
+pub(crate) fn tail_logs(files: &[(&str, &Path)]) -> String {
+    let mut diagnostics = Vec::new();
+    for (label, path) in files {
+        let contents = std::fs::read_to_string(path)
+            .ok()
+            .and_then(|contents| {
+                let lines: Vec<_> = contents.lines().rev().take(20).collect();
+                if lines.is_empty() {
+                    None
+                } else {
+                    Some(lines.into_iter().rev().collect::<Vec<_>>().join(" | "))
+                }
+            })
+            .unwrap_or_else(|| format!("<empty or unavailable at {}>", path.display()));
+        diagnostics.push(format!("{label}: {contents}"));
+    }
+    diagnostics.join("; ")
+}
+
 pub struct TestNetworks {
     #[allow(unused)]
     dir: TempDir,

crates/e2e-tests/src/sui_network.rs

@@ -36,7 +36,7 @@ use tokio::time::sleep;
 
 const DEFAULT_NUM_VALIDATORS: usize = 4;
 const DEFAULT_EPOCH_DURATION_MS: u64 = 86_400_000; // 24 hours; tests that need epoch changes should set a shorter duration
-const NETWORK_STARTUP_TIMEOUT_SECS: u64 = 60;
+const NETWORK_STARTUP_TIMEOUT_SECS: u64 = 120;
 const NETWORK_STARTUP_POLL_INTERVAL_SECS: u64 = 1;
 
 pub fn sui_binary() -> &'static Path {
@@ -60,7 +60,7 @@ pub fn sui_binary() -> &'static Path {
         .as_path()
 }
 
-async fn wait_for_ready(client: &mut Client) -> Result<()> {
+async fn wait_for_ready(client: &mut Client, dir: &Path) -> Result<()> {
     // Wait till the network has started up and at least one checkpoint has been produced
     for _ in 0..NETWORK_STARTUP_TIMEOUT_SECS {
         if let Ok(resp) = client
@@ -74,11 +74,19 @@ async fn wait_for_ready(client: &mut Client) -> Result<()> {
         sleep(Duration::from_secs(NETWORK_STARTUP_POLL_INTERVAL_SECS)).await;
     }
     anyhow::bail!(
-        "Network failed to start within {}s timeout",
+        "Network failed to start within {}s timeout. {}",
         NETWORK_STARTUP_TIMEOUT_SECS,
+        startup_diagnostics(dir),
     )
 }
 
+fn startup_diagnostics(dir: &Path) -> String {
+    crate::tail_logs(&[
+        ("stderr", &dir.join("out.stderr")),
+        ("stdout", &dir.join("out.stdout")),
+    ])
+}
+
 /// Handle for a Sui network running via pre-compiled binary
 pub struct SuiNetworkHandle {
     /// Child process running sui
@@ -172,7 +180,7 @@ impl SuiNetworkBuilder {
         let rpc_url = format!("http://127.0.0.1:{rpc_port}");
 
         let mut client = sui_rpc::Client::new(&rpc_url)?;
-        wait_for_ready(&mut client).await?;
+        wait_for_ready(&mut client, &dir).await?;
         let mut sui = SuiNetworkHandle {
             process,
             dir,