01/03: Revert "gnu: nss: Increase test timeouts."

[Marius Bakke]

mbakke pushed a commit to branch master
in repository guix.

commit 54fbac3fb56f7fc53afeaf83fed2cefdff793bde
Author: Marius Bakke <address@hidden>
Date:   Tue Apr 18 00:24:04 2017 +0200

    Revert "gnu: nss: Increase test timeouts."
    
    This turned out to be a red herring:
    
    https://lists.gnu.org/archive/html/guix-devel/2017-04/msg00365.html
    
    This reverts commit a790f262074c94f6b7acb118fb22981d71f1722f.
---
 gnu/packages/patches/nss-increase-test-timeout.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/patches/nss-increase-test-timeout.patch 
b/gnu/packages/patches/nss-increase-test-timeout.patch
index 0895daf..1e24940 100644
--- a/gnu/packages/patches/nss-increase-test-timeout.patch
+++ b/gnu/packages/patches/nss-increase-test-timeout.patch
@@ -1,4 +1,4 @@
-We've seen some tests take up to a minute to complete on a busy armhf
+We've seen some tests take more than 20s to complete on a busy armhf
 machine. Even a busy x86_64 machine can use more than 5s on some tests.
 
 Increase timeouts to increase chances of a successful build.
@@ -10,7 +10,7 @@ Increase timeouts to increase chances of a successful build.
    ASSERT_TRUE_WAIT((client_->state() != TlsAgent::STATE_CONNECTING) &&
                         (server_->state() != TlsAgent::STATE_CONNECTING),
 -                   5000);
-+                   60000);
++                   25000);
  }
  
  void TlsConnectTestBase::EnableExtendedMasterSecret() {
@@ -19,7 +19,7 @@ Increase timeouts to increase chances of a successful build.
      failing_agent = client_;
    }
 -  ASSERT_TRUE_WAIT(failing_agent->state() == TlsAgent::STATE_ERROR, 5000);
-+  ASSERT_TRUE_WAIT(failing_agent->state() == TlsAgent::STATE_ERROR, 60000);
++  ASSERT_TRUE_WAIT(failing_agent->state() == TlsAgent::STATE_ERROR, 25000);
  }
  
  void TlsConnectTestBase::ConfigureVersion(uint16_t version) {