[GitHub] cbickel closed pull request #3230: Make HA tests for controller more lenient.

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

cbickel closed pull request #3230: Make HA tests for controller more lenient.
URL: https://github.com/apache/incubator-openwhisk/pull/3230
 
 
   

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/ha/ShootComponentsTests.scala b/tests/src/test/scala/ha/ShootComponentsTests.scala
index c6e65dc8a5..6c2d00c84e 100644
--- a/tests/src/test/scala/ha/ShootComponentsTests.scala
+++ b/tests/src/test/scala/ha/ShootComponentsTests.scala
@@ -58,7 +58,7 @@ class ShootComponentsTests
 
   // Throttle requests to the remaining controllers to avoid getting 429s. (60 req/min)
   val amountOfControllers = WhiskProperties.getProperty(WhiskConfig.controllerInstances).toInt
-  val limit = WhiskProperties.getProperty(WhiskConfig.actionInvokeConcurrentLimit).toDouble
+  val limit = WhiskProperties.getProperty(WhiskConfig.actionInvokePerMinuteLimit).toDouble
   val limitPerController = limit / amountOfControllers
   val allowedRequestsPerMinute = (amountOfControllers - 1.0) * limitPerController
   val timeBeweenRequests = 60.seconds / allowedRequestsPerMinute
@@ -187,11 +187,11 @@ class ShootComponentsTests
       val requests = requestsBeforeRestart ++ requestsAfterRestart
 
       val unsuccessfulInvokes = requests.map(_._1).count(_ != TestUtils.SUCCESS_EXIT)
-      // Allow 3 failures for the 100 seconds
-      unsuccessfulInvokes should be <= 3
+      // Allow 5 failures for the 100 seconds
+      unsuccessfulInvokes should be <= 5
 
       val unsuccessfulGets = requests.map(_._2).count(_ != TestUtils.SUCCESS_EXIT)
-      // Only allow 1 failure in GET requests, because they are idempotent and they should be passed to the next controller if one crashes
+      // Allow no failures in GET requests, because they are idempotent and they should be passed to the next controller if one crashes
       unsuccessfulGets shouldBe 0
 
       // Check that both controllers are up


 

----------------------------------------------------------------
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