[GitHub] dubeejw closed pull request #235: update names of actions linked to triggers to be unique

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

dubeejw closed pull request #235: update names of actions linked to triggers to be unique
URL: https://github.com/apache/incubator-openwhisk-package-kafka/pull/235
 
 
   

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/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)
             }


 

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