[incubator-openwhisk] branch master updated: Retry in feed tests to avoid race condition. (#3480)

[cbickel]

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 4c84f1a  Retry in feed tests to avoid race condition. (#3480)
4c84f1a is described below

commit 4c84f1a629601ca818564f086866708a8ca06140
Author: Vadim Raskin <raskinva...@gmail.com>
AuthorDate: Fri Mar 23 14:57:39 2018 +0100

    Retry in feed tests to avoid race condition. (#3480)
---
 tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala 
b/tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala
index 99e839f..0a6174a 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskEntitlementTests.scala
@@ -31,6 +31,8 @@ import spray.json._
 import spray.json.DefaultJsonProtocol._
 import whisk.core.entity.Subject
 import whisk.core.entity.WhiskPackage
+import whisk.utils.retry
+import scala.concurrent.duration._
 
 @RunWith(classOf[JUnitRunner])
 abstract class WskEntitlementTests extends TestHelpers with WskTestHelpers 
with BeforeAndAfterAll {
@@ -366,7 +368,8 @@ abstract class WskEntitlementTests extends TestHelpers with 
WskTestHelpers with
         assetHelper.withCleaner(wsk.trigger, "badfeed", confirmDelete = false) 
{ (trigger, name) =>
           trigger.create(name, feed = Some(fullyQualifiedFeedName), 
expectedExitCode = timeoutCode)(wp)
         }
-        wsk.trigger.get("badfeed", expectedExitCode = notFoundCode)(wp)
+        // with several active controllers race condition with cache 
invalidation might occur, thus retry
+        retry(wsk.trigger.get("badfeed", expectedExitCode = notFoundCode)(wp), 
10, Some(500.milliseconds))
       }
   }
 

-- 
To stop receiving notification emails like this one, please contact
cbic...@apache.org.