[incubator-openwhisk] branch master updated: Bump replication timeout, abort test with correct message (#2696)

[cb...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

cbickel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 3ebc67e  Bump replication timeout, abort test with correct message (#2696)
3ebc67e is described below

commit 3ebc67e5641ff44653015cd9c074ed6aaf98ee37
Author: Markus Thömmes <ma...@me.com>
AuthorDate: Tue Sep 5 14:00:14 2017 +0200

    Bump replication timeout, abort test with correct message (#2696)
---
 .../src/test/scala/whisk/core/database/test/ReplicatorTests.scala  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/tests/src/test/scala/whisk/core/database/test/ReplicatorTests.scala b/tests/src/test/scala/whisk/core/database/test/ReplicatorTests.scala
index a3d7e02..0090b0e 100644
--- a/tests/src/test/scala/whisk/core/database/test/ReplicatorTests.scala
+++ b/tests/src/test/scala/whisk/core/database/test/ReplicatorTests.scala
@@ -104,7 +104,8 @@ class ReplicatorTests extends FlatSpec
 
     /** Wait for a replication to finish */
     def waitForReplication(dbName: String) = {
-        waitfor(() => {
+        val timeout = 5.minutes
+        val replicationResult = waitfor(() => {
             val replicatorDoc = replicatorClient.getDoc(dbName).futureValue
             replicatorDoc shouldBe 'right
 
@@ -112,7 +113,9 @@ class ReplicatorTests extends FlatSpec
             println(s"Waiting for replication, state: $state")
 
             state.contains("completed".toJson)
-        }, totalWait = 2.minutes)
+        }, totalWait = timeout)
+
+        assert(replicationResult, s"replication did not finish in $timeout")
     }
 
     /** Compares to databases to full equality */

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].