aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeir Storli <geirstorli@yahoo.no>2016-07-01 12:33:52 +0200
committerGitHub <noreply@github.com>2016-07-01 12:33:52 +0200
commit0d0688ec8aa88a35330a831242017da1dc513da8 (patch)
tree24e1faf59a2bf17616a0f404cf55aef01df98819
parent70a1add5959e7b1ea9fc6c24de8574532e702b2a (diff)
parent3c5dc12154a5d0fde844527fdd2d58c8b6e3cab4 (diff)
Merge pull request #279 from yahoo/havardpe/reduce-timeout-for-expected-failure
use shorter timeout for something we do not expect to happen
-rw-r--r--searchcore/src/tests/proton/config/config.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/searchcore/src/tests/proton/config/config.cpp b/searchcore/src/tests/proton/config/config.cpp
index 24cf4cec4cc..3cb6f3c3e23 100644
--- a/searchcore/src/tests/proton/config/config.cpp
+++ b/searchcore/src/tests/proton/config/config.cpp
@@ -261,7 +261,7 @@ TEST_FFF("require_that_protonconfigurer_reconfigures_dbowners",
f1.removeDocType("typea");
f1.reload();
ASSERT_TRUE(f2.waitUntilConfigured(60000));
- ASSERT_FALSE(dbA.waitUntilConfigured(60000));
+ ASSERT_FALSE(dbA.waitUntilConfigured(1000));
f3.close();
}