[incubator-openwhisk-cli] branch master updated: Fix build break caused by constant renaming in openwhisk (#451)

[mh...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

mhenke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git


The following commit(s) were added to refs/heads/master by this push:
     new 76203e8  Fix build break caused by constant renaming in openwhisk (#451)
76203e8 is described below

commit 76203e838eb3db88f9a53361b9c0d787a27c4435
Author: Sven Lange-Last <sv...@de.ibm.com>
AuthorDate: Tue Jul 9 15:57:12 2019 +0200

    Fix build break caused by constant renaming in openwhisk (#451)
    
    Adapt to https://github.com/apache/incubator-openwhisk/pull/4537
---
 .../openwhisk/core/cli/test/WskCliBasicUsageTests.scala      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala
index 02c2ec9..c4f9956 100644
--- a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala
+++ b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/WskCliBasicUsageTests.scala
@@ -2161,9 +2161,9 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers {
         // Limits to assert, standard values if CLI omits certain values
         val limits = JsObject(
           "timeout" -> timeout.getOrElse(STD_DURATION).toMillis.toJson,
-          "memory" -> memory.getOrElse(stdMemory).toMB.toInt.toJson,
-          "logs" -> logs.getOrElse(stdLogSize).toMB.toInt.toJson,
-          "concurrency" -> concurrency.getOrElse(stdConcurrent).toJson)
+          "memory" -> memory.getOrElse(STD_MEMORY).toMB.toInt.toJson,
+          "logs" -> logs.getOrElse(STD_LOGSIZE).toMB.toInt.toJson,
+          "concurrency" -> concurrency.getOrElse(STD_CONCURRENT).toJson)
 
         val name = "ActionLimitTests" + Instant.now.toEpochMilli
         val createResult =
@@ -2201,9 +2201,9 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers {
       // Assert for valid permutations that the values are set correctly
       for {
         time <- Seq(None, Some(MIN_DURATION), Some(MAX_DURATION))
-        mem <- Seq(None, Some(minMemory), Some(maxMemory))
-        log <- Seq(None, Some(minLogSize), Some(maxLogSize))
-        concurrency <- Seq(None, Some(minConcurrent), Some(maxConcurrent))
+        mem <- Seq(None, Some(MIN_MEMORY), Some(MAX_MEMORY))
+        log <- Seq(None, Some(MIN_LOGSIZE), Some(MAX_LOGSIZE))
+        concurrency <- Seq(None, Some(MIN_CONCURRENT), Some(MAX_CONCURRENT))
       } testLimit(time, mem, log, concurrency)
 
       // Assert that invalid permutation are rejected