mhenke1 closed pull request #4119: Fix test failures in case min and max
concurrency settings are identical
URL: https://github.com/apache/incubator-openwhisk/pull/4119
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/org/apache/openwhisk/core/limits/ActionLimitsTests.scala
b/tests/src/test/scala/org/apache/openwhisk/core/limits/ActionLimitsTests.scala
index feba31ee3f..b2376c8181 100644
---
a/tests/src/test/scala/org/apache/openwhisk/core/limits/ActionLimitsTests.scala
+++
b/tests/src/test/scala/org/apache/openwhisk/core/limits/ActionLimitsTests.scala
@@ -130,7 +130,11 @@ class ActionLimitsTests extends TestHelpers with
WskTestHelpers with WskActorSys
time <- Seq(None, Some(TimeLimit.MIN_DURATION),
Some(TimeLimit.MAX_DURATION))
mem <- Seq(None, Some(MemoryLimit.minMemory),
Some(MemoryLimit.maxMemory))
log <- Seq(None, Some(LogLimit.minLogSize), Some(LogLimit.maxLogSize))
- concurrency <- Seq(None, Some(ConcurrencyLimit.minConcurrent),
Some(ConcurrencyLimit.maxConcurrent))
+ concurrency <- if (ConcurrencyLimit.minConcurrent ==
ConcurrencyLimit.maxConcurrent) {
+ Seq(None, Some(ConcurrencyLimit.minConcurrent))
+ } else {
+ Seq(None, Some(ConcurrencyLimit.minConcurrent),
Some(ConcurrencyLimit.maxConcurrent))
+ }
} yield PermutationTestParameter(time, mem, log, concurrency)
} ++
// Add variations for negative tests
----------------------------------------------------------------
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:
us...@infra.apache.org
With regards,
Apache Git Services
