You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cs...@apache.org on 2018/12/17 12:48:23 UTC

[incubator-openwhisk-cli] 04/04: Fix test name

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

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

commit 5bfb1c06ea9cb29bec6fe5ddad3a06729772bfd7
Author: Chetan Mehrotra <ch...@apache.org>
AuthorDate: Fri Dec 14 13:41:17 2018 +0530

    Fix test name
---
 .../scala/system/basic/WskCliActivationTests.scala | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/tests/src/test/scala/system/basic/WskCliActivationTests.scala b/tests/src/test/scala/system/basic/WskCliActivationTests.scala
index f840c3e..3cd407a 100644
--- a/tests/src/test/scala/system/basic/WskCliActivationTests.scala
+++ b/tests/src/test/scala/system/basic/WskCliActivationTests.scala
@@ -38,13 +38,11 @@ class WskCliActivationTests extends TestHelpers with WskTestHelpers with HttpPro
 
   implicit val wskprops: WskProps = WskProps()
 
-  it should "create, and invoke an action that utilizes a docker container" in withAssetCleaner(wskprops) {
-    val name = "dockerContainer"
+  it should "change the since time as it polls" in withAssetCleaner(wskprops) {
+    val name = "pollTest"
     (wp, assetHelper) =>
-      assetHelper.withCleaner(wsk.action, name) {
-        // this docker image will be need to be pulled from dockerhub and hence has to be published there first
-        (action, _) =>
-          action.create(name, None, docker = Some("openwhisk/example"))
+      assetHelper.withCleaner(wsk.action, name) { (action, _) =>
+        action.create(name, Some(TestUtils.getTestActionFilename("hello.js")))
       }
 
       val args = Map("payload" -> "test".toJson)
@@ -85,17 +83,19 @@ class WskCliActivationTests extends TestHelpers with WskTestHelpers with HttpPro
 
         //There should be more than 1 activationId in common between poll output
         //and actual invoked actions output
+        //This is required to ensure that since time can change which would only
+        //happen if more than one activation result is picked up in poll
         withClue(
           s"activations received ${activations.mkString("\n")}, console output $consoleResult. Expecting" +
             s"more than one matching activation between these 2") {
           idsInPoll.size should be > 1
-        }
 
-        //Collect the 'since' value passed during poll requests
-        val sinceTimes = requests.map(_._1.uri.query()).flatMap(_.get("since")).toSet
+          //Collect the 'since' value passed during poll requests
+          val sinceTimes = requests.map(_._1.uri.query()).flatMap(_.get("since")).toSet
 
-        withClue(s"value of 'since' $sinceTimes should have changed") {
-          sinceTimes.size should be > 1
+          withClue(s"value of 'since' $sinceTimes should have changed") {
+            sinceTimes.size should be > 1
+          }
         }
       }
   }