[GitHub] cbickel closed pull request #3554: Bump timeout of activation logs test.

[GitBox <gi...@apache.org>]

cbickel closed pull request #3554: Bump timeout of activation logs test.
URL: https://github.com/apache/incubator-openwhisk/pull/3554
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/tests/src/test/scala/system/basic/WskActivationTests.scala b/tests/src/test/scala/system/basic/WskActivationTests.scala
index 06ce382662..7adc5fa4ac 100644
--- a/tests/src/test/scala/system/basic/WskActivationTests.scala
+++ b/tests/src/test/scala/system/basic/WskActivationTests.scala
@@ -20,14 +20,14 @@ package system.basic
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner
 
-import common.{BaseWsk, JsHelpers, TestHelpers, TestUtils, WskProps, WskTestHelpers}
+import common.{BaseWsk, TestHelpers, TestUtils, WskProps, WskTestHelpers}
 
 import whisk.utils.retry
 
 import scala.concurrent.duration._
 
 @RunWith(classOf[JUnitRunner])
-abstract class WskActivationTests extends TestHelpers with WskTestHelpers with JsHelpers {
+abstract class WskActivationTests extends TestHelpers with WskTestHelpers {
   implicit val wskprops = WskProps()
 
   val wsk: BaseWsk
@@ -44,14 +44,17 @@ abstract class WskActivationTests extends TestHelpers with WskTestHelpers with J
 
     val run = wsk.action.invoke(name, blocking = true)
 
-    // Use withActivation() to reduce intermittent failures that may result from eventually consistent DBs
+    // Even though the activation was blocking, the activation itself might not have appeared in the database.
     withActivation(wsk.activation, run) { activation =>
+      // Needs to be retried because there might be an SPI being plugged in which is handling logs not consistent with
+      // the database where the activation itself comes from (activation in CouchDB, logs in Elasticsearch for
+      // example).
       retry({
         val logs = wsk.activation.logs(Some(activation.activationId)).stdout
 
-        logs should include regex (logFormat.format("stdout", "this is stdout"))
-        logs should include regex (logFormat.format("stderr", "this is stderr"))
-      }, 10, Some(1.second))
+        logs should include regex logFormat.format("stdout", "this is stdout")
+        logs should include regex logFormat.format("stderr", "this is stderr")
+      }, 60 * 5, Some(1.second)) // retry for 5 minutes
     }
   }
 }


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services