From: Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Date: Thu, 6 Jun 2019 16:18:44 +0000 (+0100)
Subject: _increase_timeout_for_slow_arches_like_mips
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c4f0e4f01539ae0307227942faba989e926c6fa2;p=cargo.git

_increase_timeout_for_slow_arches_like_mips


Gbp-Pq: Name 1003_increase_timeout_for_slow_arches_like_mips.patch
---

diff --git a/src/cargo/core/resolver/types.rs b/src/cargo/core/resolver/types.rs
index b9923bf77..4766be3f4 100644
--- a/src/cargo/core/resolver/types.rs
+++ b/src/cargo/core/resolver/types.rs
@@ -64,7 +64,7 @@ impl ResolverProgress {
         // If any of them are removed then it takes more than I am willing to measure.
         // So lets fail the test fast if we have ben running for two long.
         if cfg!(debug_assertions) && (self.ticks % 1000 == 0) {
-            assert!(self.start.elapsed() - self.deps_time < Duration::from_secs(90));
+            assert!(self.start.elapsed() - self.deps_time < Duration::from_secs(360));
         }
         Ok(())
     }
diff --git a/tests/testsuite/concurrent.rs b/tests/testsuite/concurrent.rs
index a999467f9..34b84cf25 100644
--- a/tests/testsuite/concurrent.rs
+++ b/tests/testsuite/concurrent.rs
@@ -511,7 +511,7 @@ fn no_deadlock_with_git_dependencies() {
     }
 
     for _ in 0..n_concurrent_builds {
-        let result = rx.recv_timeout(Duration::from_secs(30)).expect("Deadlock!");
+        let result = rx.recv_timeout(Duration::from_secs(120)).expect("Deadlock!");
         execs().run_output(&result);
     }
 }
diff --git a/tests/testsuite/support/resolver.rs b/tests/testsuite/support/resolver.rs
index 9dca8fcfd..866949bf1 100644
--- a/tests/testsuite/support/resolver.rs
+++ b/tests/testsuite/support/resolver.rs
@@ -117,7 +117,7 @@ pub fn resolve_with_config_raw(
 
     // The largest test in our suite takes less then 30 sec.
     // So lets fail the test if we have ben running for two long.
-    assert!(start.elapsed() < Duration::from_secs(60));
+    assert!(start.elapsed() < Duration::from_secs(240));
     resolve
 }