_increase_timeout_for_slow_arches_like_mips
authorRust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
Thu, 24 Jan 2019 08:29:51 +0000 (08:29 +0000)
committerXimin Luo <infinity0@debian.org>
Thu, 24 Jan 2019 08:29:51 +0000 (08:29 +0000)
Gbp-Pq: Name 1003_increase_timeout_for_slow_arches_like_mips.patch

src/cargo/core/resolver/types.rs
tests/testsuite/concurrent.rs
tests/testsuite/support/resolver.rs

index b9494546db72f555891ec9fe6f200b900efa8bcc..c114eb4aa2c534d525a0d61271626b771a49cd29 100644 (file)
@@ -57,7 +57,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(())
     }
index a999467f9d6fee739e7e462b06df65e6f7667a4c..34b84cf255ece284cc784981f99abcd441cd93c4 100644 (file)
@@ -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);
     }
 }
index 9b97daf0b0eddbef598f69b57a18b908f70e20ff..8997041512419bb23ccfe28174603b590f62b9c6 100644 (file)
@@ -118,7 +118,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
 }