[incubator-openwhisk-package-kafka] branch master updated: Update name of action linked to trigger to be unique to avoid failed cleaning up of assets at end of test (#235)

[dubeejw]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 951c445  Update name of action linked to trigger to be unique to avoid 
failed cleaning up of assets at end of test (#235)
951c445 is described below

commit 951c445ceafd0ccde689faf9c86d4ccb0f685acd
Author: Adnan Baruni <abar...@users.noreply.github.com>
AuthorDate: Tue Dec 19 13:30:45 2017 -0600

    Update name of action linked to trigger to be unique to avoid failed 
cleaning up of assets at end of test (#235)
---
 tests/src/test/scala/system/health/BasicHealthTest.scala         | 2 +-
 tests/src/test/scala/system/packages/MessageHubFeedTests.scala   | 9 ++++++++-
 .../src/test/scala/system/packages/MessageHubProduceTests.scala  | 5 ++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/tests/src/test/scala/system/health/BasicHealthTest.scala 
b/tests/src/test/scala/system/health/BasicHealthTest.scala
index 2ee1bff..f88a164 100644
--- a/tests/src/test/scala/system/health/BasicHealthTest.scala
+++ b/tests/src/test/scala/system/health/BasicHealthTest.scala
@@ -147,7 +147,7 @@ class BasicHealthTest
       }
 
       val defaultAction = Some(TestUtils.getTestActionFilename("hello.js"))
-      val defaultActionName = "hello"
+      val defaultActionName = s"helloKafka-${currentTime}"
 
       assetHelper.withCleaner(wsk.action, defaultActionName) { (action, name) 
=>
         action.create(name, defaultAction)
diff --git a/tests/src/test/scala/system/packages/MessageHubFeedTests.scala 
b/tests/src/test/scala/system/packages/MessageHubFeedTests.scala
index f1c2192..6341bbf 100644
--- a/tests/src/test/scala/system/packages/MessageHubFeedTests.scala
+++ b/tests/src/test/scala/system/packages/MessageHubFeedTests.scala
@@ -71,7 +71,6 @@ class MessageHubFeedTests
   val actionName = s"${messagingPackage}/${messageHubFeed}"
 
   val defaultAction = Some(TestUtils.getTestActionFilename("hello.js"))
-  val defaultActionName = "hello"
 
   behavior of "Message Hub feed action"
 
@@ -139,6 +138,8 @@ class MessageHubFeedTests
         "isBinaryKey" -> true.toJson,
         "isBinaryValue" -> true.toJson))
 
+      val defaultActionName = s"helloKafka-${currentTime}"
+
       assetHelper.withCleaner(wsk.action, defaultActionName) { (action, name) 
=>
         action.create(name, defaultAction)
       }
@@ -210,6 +211,8 @@ class MessageHubFeedTests
         "isBinaryKey" -> false.toJson,
         "isBinaryValue" -> false.toJson))
 
+      val defaultActionName = s"helloKafka-${currentTime}"
+
       assetHelper.withCleaner(wsk.action, defaultActionName) { (action, name) 
=>
         action.create(name, defaultAction)
       }
@@ -267,6 +270,8 @@ class MessageHubFeedTests
         "isBinaryKey" -> false.toJson,
         "isBinaryValue" -> false.toJson))
 
+      val defaultActionName = s"helloKafka-${currentTime}"
+
       assetHelper.withCleaner(wsk.action, defaultActionName) { (action, name) 
=>
         action.create(name, defaultAction)
       }
@@ -387,6 +392,8 @@ class MessageHubFeedTests
         "topic" -> topic.toJson
       ))
 
+      val defaultActionName = s"helloKafka-${currentTime}"
+
       assetHelper.withCleaner(wsk.action, defaultActionName) { (action, name) 
=>
         action.create(name, defaultAction)
       }
diff --git a/tests/src/test/scala/system/packages/MessageHubProduceTests.scala 
b/tests/src/test/scala/system/packages/MessageHubProduceTests.scala
index d7fad10..6de9417 100644
--- a/tests/src/test/scala/system/packages/MessageHubProduceTests.scala
+++ b/tests/src/test/scala/system/packages/MessageHubProduceTests.scala
@@ -68,7 +68,6 @@ class MessageHubProduceTests
     val maxRetries = System.getProperty("max.retries", "60").toInt
 
     val defaultAction = Some(TestUtils.getTestActionFilename("hello.js"))
-    val defaultActionName = "hello"
 
     // these parameter values are 100% valid and should work as-is
     val validParameters = Map(
@@ -175,6 +174,8 @@ class MessageHubProduceTests
                     activation.response.success shouldBe true
             }
 
+            val defaultActionName = s"helloKafka-${currentTime}"
+
             assetHelper.withCleaner(wsk.action, defaultActionName) { (action, 
name) =>
                 action.create(name, defaultAction)
             }
@@ -242,6 +243,8 @@ class MessageHubProduceTests
                     activation.response.success shouldBe true
             }
 
+            val defaultActionName = s"helloKafka-${currentTime}"
+
             assetHelper.withCleaner(wsk.action, defaultActionName) { (action, 
name) =>
                 action.create(name, defaultAction)
             }

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <commits@openwhisk.apache.org>'].