diff options
author | Leo Famulari <leo@famulari.name> | 2017-04-14 13:07:16 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2017-04-14 13:07:16 -0400 |
commit | c57ce31a896f659a2e311c2ee90b9027f4a405bc (patch) | |
tree | 17d0d0238ca1db65cce1f2ac68273af0483c9e7d /gnu/packages/patches/nss-increase-test-timeout.patch | |
parent | f575efa12c5df9f9879b7be0fe3593a3106a346d (diff) | |
parent | 8439c9c05eab5c98d889fb1de56bc78f62a8058f (diff) | |
download | guix-c57ce31a896f659a2e311c2ee90b9027f4a405bc.tar guix-c57ce31a896f659a2e311c2ee90b9027f4a405bc.tar.gz |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/patches/nss-increase-test-timeout.patch')
-rw-r--r-- | gnu/packages/patches/nss-increase-test-timeout.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gnu/packages/patches/nss-increase-test-timeout.patch b/gnu/packages/patches/nss-increase-test-timeout.patch index c6aac6ac00..1e24940322 100644 --- a/gnu/packages/patches/nss-increase-test-timeout.patch +++ b/gnu/packages/patches/nss-increase-test-timeout.patch @@ -14,12 +14,12 @@ Increase timeouts to increase chances of a successful build. } void TlsConnectTestBase::EnableExtendedMasterSecret() { -@@ -387,7 +387,7 @@ - } else { - fail_agent = server_; +@@ -385,7 +385,7 @@ + if (failing_side == TlsAgent::CLIENT) { + failing_agent = client_; } -- ASSERT_TRUE_WAIT(fail_agent->state() == TlsAgent::STATE_ERROR, 5000); -+ ASSERT_TRUE_WAIT(fail_agent->state() == TlsAgent::STATE_ERROR, 25000); +- ASSERT_TRUE_WAIT(failing_agent->state() == TlsAgent::STATE_ERROR, 5000); ++ ASSERT_TRUE_WAIT(failing_agent->state() == TlsAgent::STATE_ERROR, 25000); } void TlsConnectTestBase::ConfigureVersion(uint16_t version) { |