[GitHub] rabbah closed pull request #4048: Ensure that limits are set properly

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

rabbah closed pull request #4048: Ensure that limits are set properly
URL: https://github.com/apache/incubator-openwhisk/pull/4048
 
 
   

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/whisk/core/database/LimitsCommandTests.scala b/tests/src/test/scala/whisk/core/database/LimitsCommandTests.scala
index 69684dbea7..f1de23f398 100644
--- a/tests/src/test/scala/whisk/core/database/LimitsCommandTests.scala
+++ b/tests/src/test/scala/whisk/core/database/LimitsCommandTests.scala
@@ -55,7 +55,11 @@ class LimitsCommandTests extends FlatSpec with WhiskAdminCliTestBase {
       ns) shouldBe CommandMessages.limitsSuccessfullySet(ns)
 
     val limits = limitsStore.get[LimitEntity](DocInfo(LimitsCommand.limitIdOf(EntityName(ns)))).futureValue
-    limits.limits shouldBe UserLimits(Some(3), Some(7), Some(11), Some(Set("nodejs:6", "blackbox")))
+    limits.limits shouldBe UserLimits(
+      invocationsPerMinute = Some(3),
+      firesPerMinute = Some(7),
+      concurrentInvocations = Some(11),
+      allowedKinds = Some(Set("nodejs:6", "blackbox")))
 
     resultOk("limits", "set", "--invocationsPerMinute", "13", ns) shouldBe CommandMessages.limitsSuccessfullyUpdated(ns)
 
diff --git a/tools/admin/src/main/scala/whisk/core/database/LimitsCommand.scala b/tools/admin/src/main/scala/whisk/core/database/LimitsCommand.scala
index 4e0e6e0244..168fc4cb37 100644
--- a/tools/admin/src/main/scala/whisk/core/database/LimitsCommand.scala
+++ b/tools/admin/src/main/scala/whisk/core/database/LimitsCommand.scala
@@ -77,8 +77,8 @@ class LimitsCommand extends Subcommand("limits") with WhiskCommand {
         EntityName(namespace()),
         UserLimits(
           invocationsPerMinute.toOption,
-          firesPerMinute.toOption,
           concurrentInvocations.toOption,
+          firesPerMinute.toOption,
           allowedKinds.toOption.map(_.toSet)))
   }
   addSubcommand(set)


 

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