markusthoemmes closed pull request #3351: Fix intermitent test failures due to
non-unique entity names
URL: https://github.com/apache/incubator-openwhisk/pull/3351
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/common/WskTestHelpers.scala
b/tests/src/test/scala/common/WskTestHelpers.scala
index 5be175c44b..b81aa91deb 100644
--- a/tests/src/test/scala/common/WskTestHelpers.scala
+++ b/tests/src/test/scala/common/WskTestHelpers.scala
@@ -293,4 +293,9 @@ trait WskTestHelpers extends Matchers {
wskadmin.cli(Seq("user", "delete", subject)).stdout should
include("Subject deleted")
}
}
+
+ /**
+ * Append the current timestamp in ms
+ */
+ def withTimestamp(text: String) = s"${text}-${System.currentTimeMillis}"
}
diff --git a/tests/src/test/scala/system/basic/WskBasicTests.scala
b/tests/src/test/scala/system/basic/WskBasicTests.scala
index 1fd93fd79b..96c689394f 100644
--- a/tests/src/test/scala/system/basic/WskBasicTests.scala
+++ b/tests/src/test/scala/system/basic/WskBasicTests.scala
@@ -48,11 +48,6 @@ class WskBasicTests extends TestHelpers with WskTestHelpers {
val wsk: common.rest.WskRest = new WskRest
val defaultAction: Some[String] =
Some(TestUtils.getTestActionFilename("hello.js"))
- /**
- * Append the current timestamp in ms
- */
- def withTimestamp(text: String) = s"${text}-${System.currentTimeMillis}"
-
behavior of "Wsk REST"
it should "reject creating duplicate entity" in withAssetCleaner(wskprops) {
(wp, assetHelper) =>
diff --git a/tests/src/test/scala/system/basic/WskConsoleTests.scala
b/tests/src/test/scala/system/basic/WskConsoleTests.scala
index 9df9bcb4c0..d03d346e89 100644
--- a/tests/src/test/scala/system/basic/WskConsoleTests.scala
+++ b/tests/src/test/scala/system/basic/WskConsoleTests.scala
@@ -46,11 +46,6 @@ abstract class WskConsoleTests extends TestHelpers with
WskTestHelpers {
val wsk: BaseWsk
val guestNamespace = wskprops.namespace
- /**
- * Append the current timestamp in ms
- */
- def withTimestamp(text: String) = s"${text}-${System.currentTimeMillis}"
-
behavior of "Wsk Activation Console"
it should "show an activation log message for hello world" in
withAssetCleaner(wskprops) { (wp, assetHelper) =>
diff --git a/tests/src/test/scala/system/basic/WskPackageTests.scala
b/tests/src/test/scala/system/basic/WskPackageTests.scala
index fe0dabab48..441cadffb9 100644
--- a/tests/src/test/scala/system/basic/WskPackageTests.scala
+++ b/tests/src/test/scala/system/basic/WskPackageTests.scala
@@ -43,7 +43,7 @@ abstract class WskPackageTests extends TestHelpers with
WskTestHelpers {
behavior of "Wsk Package"
it should "allow creation and deletion of a package" in
withAssetCleaner(wskprops) { (wp, assetHelper) =>
- val name = "simplepackage"
+ val name = withTimestamp("simplepackage")
assetHelper.withCleaner(wsk.pkg, name) { (pkg, _) =>
pkg.create(name, Map())
}
@@ -53,14 +53,14 @@ abstract class WskPackageTests extends TestHelpers with
WskTestHelpers {
val params2 = Map("p1" -> "v1".toJson, "p2" -> "v2".toJson, "p3" ->
"v3".toJson)
it should "allow creation of a package with parameters" in
withAssetCleaner(wskprops) { (wp, assetHelper) =>
- val name = "simplepackagewithparams"
+ val name = withTimestamp("simplepackagewithparams")
assetHelper.withCleaner(wsk.pkg, name) { (pkg, _) =>
pkg.create(name, params1)
}
}
it should "allow updating a package" in withAssetCleaner(wskprops) { (wp,
assetHelper) =>
- val name = "simplepackagetoupdate"
+ val name = withTimestamp("simplepackagetoupdate")
assetHelper.withCleaner(wsk.pkg, name) { (pkg, _) =>
pkg.create(name, params1)
pkg.create(name, params2, update = true)
@@ -68,8 +68,8 @@ abstract class WskPackageTests extends TestHelpers with
WskTestHelpers {
}
it should "allow binding of a package" in withAssetCleaner(wskprops) { (wp,
assetHelper) =>
- val name = "simplepackagetobind"
- val bindName = "simplebind"
+ val name = withTimestamp("simplepackagetobind")
+ val bindName = withTimestamp("simplebind")
assetHelper.withCleaner(wsk.pkg, name) { (pkg, _) =>
pkg.create(name, params1)
}
@@ -79,9 +79,9 @@ abstract class WskPackageTests extends TestHelpers with
WskTestHelpers {
}
it should "perform package binds so parameters are inherited" in
withAssetCleaner(wskprops) { (wp, assetHelper) =>
- val packageName = "package1"
- val bindName = "package2"
- val actionName = "print"
+ val packageName = withTimestamp("package1")
+ val bindName = withTimestamp("package2")
+ val actionName = withTimestamp("print")
val packageActionName = packageName + "/" + actionName
val bindActionName = bindName + "/" + actionName
val packageParams = Map("key1a" -> "value1a".toJson, "key1b" ->
"value1b".toJson)
diff --git a/tests/src/test/scala/system/basic/WskRuleTests.scala
b/tests/src/test/scala/system/basic/WskRuleTests.scala
index c0fc9d020e..c7b5b07337 100644
--- a/tests/src/test/scala/system/basic/WskRuleTests.scala
+++ b/tests/src/test/scala/system/basic/WskRuleTests.scala
@@ -76,11 +76,6 @@ abstract class WskRuleTests extends TestHelpers with
WskTestHelpers {
}
}
- /**
- * Append the current timestamp in ms
- */
- def withTimestamp(text: String) = s"$text-${System.currentTimeMillis}"
-
behavior of "Whisk rules"
it should "preserve rule status when a rule is updated" in
withAssetCleaner(wskprops) { (wp, assetHelper) =>
@@ -103,20 +98,12 @@ abstract class WskRuleTests extends TestHelpers with
WskTestHelpers {
if (status == active) wsk.rule.enable(ruleName) else
wsk.rule.disable(ruleName)
// Needs to be retried since the enable/disable causes a cache
invalidation which needs to propagate first
- retry(
- {
- wsk.rule
- .create(ruleName, trigger, actionName, update = true)
- .stdout
- .parseJson
- .asJsObject
- .fields
- .get("status") shouldBe status
-
-
wsk.rule.get(ruleName).stdout.parseJson.asJsObject.fields.get("status")
shouldBe status
- },
- 10,
- Some(1.second))
+ retry({
+ // CLI stdout must strip out the preamble text (i.e. "ok: got rule
XXXXX") to get at the JSON
+ wsk.rule.create(ruleName, trigger, actionName, update = true)
+ val getStdout = wsk.rule.get(ruleName).stdout
+
getStdout.substring(getStdout.indexOf('{')).parseJson.asJsObject.fields.get("status")
shouldBe status
+ }, 10, Some(1.second))
}
}
diff --git a/tests/src/test/scala/system/basic/WskSequenceTests.scala
b/tests/src/test/scala/system/basic/WskSequenceTests.scala
index f7dc39d891..28d6290eab 100644
--- a/tests/src/test/scala/system/basic/WskSequenceTests.scala
+++ b/tests/src/test/scala/system/basic/WskSequenceTests.scala
@@ -63,7 +63,7 @@ abstract class WskSequenceTests extends TestHelpers with
ScalatestRouteTest with
it should "invoke a sequence with normal payload and payload with error
field" in withAssetCleaner(wskprops) {
(wp, assetHelper) =>
- val name = "sequence"
+ val name = withTimestamp("sequence")
val actions = Seq("split", "sort", "head", "cat")
for (actionName <- actions) {
val file = TestUtils.getTestActionFilename(s"$actionName.js")
@@ -120,8 +120,8 @@ abstract class WskSequenceTests extends TestHelpers with
ScalatestRouteTest with
}
it should "invoke a sequence with an enclosing sequence action" in
withAssetCleaner(wskprops) { (wp, assetHelper) =>
- val inner_name = "inner_sequence"
- val outer_name = "outer_sequence"
+ val inner_name = withTimestamp("inner_sequence")
+ val outer_name = withTimestamp("outer_sequence")
val inner_actions = Seq("sort", "head")
val actions = Seq("split") ++ inner_actions ++ Seq("cat")
// create atomic actions
@@ -141,7 +141,7 @@ abstract class WskSequenceTests extends TestHelpers with
ScalatestRouteTest with
// create outer sequence
assetHelper.withCleaner(wsk.action, outer_name) {
- val outer_sequence = Seq("split", "inner_sequence", "cat").mkString(",")
+ val outer_sequence = Seq("split", inner_name, "cat").mkString(",")
(action, _) =>
action.create(outer_name, Some(outer_sequence), kind =
Some("sequence"))
}
@@ -171,22 +171,23 @@ abstract class WskSequenceTests extends TestHelpers with
ScalatestRouteTest with
*/
it should "replace atomic component in a sequence that is too long and
report invoke error" in withAssetCleaner(
wskprops) { (wp, assetHelper) =>
- val xName = "xSequence"
- val sName = "sSequence"
+ val xName = withTimestamp("xSequence")
+ val sName = withTimestamp("sSequence")
val echo = "echo"
+ val echoActionName = withTimestamp(s"$echo")
// create echo action
val file = TestUtils.getTestActionFilename(s"$echo.js")
- assetHelper.withCleaner(wsk.action, echo) { (action, actionName) =>
+ assetHelper.withCleaner(wsk.action, echoActionName) { (action, actionName)
=>
action.create(name = actionName, artifact = Some(file), timeout =
Some(allowedActionDuration))
}
// create x
assetHelper.withCleaner(wsk.action, xName) { (action, seqName) =>
- action.create(seqName, Some(echo), kind = Some("sequence"))
+ action.create(seqName, Some(echoActionName), kind = Some("sequence"))
}
// create s
assetHelper.withCleaner(wsk.action, sName) { (action, seqName) =>
- action.create(seqName, Some(s"$echo,$xName,$echo"), kind =
Some("sequence"))
+ action.create(seqName, Some(s"$echoActionName,$xName,$echoActionName"),
kind = Some("sequence"))
}
// invoke s
@@ -202,7 +203,7 @@ abstract class WskSequenceTests extends TestHelpers with
ScalatestRouteTest with
}
// update x with limit echo
val limit = whiskConfig.actionSequenceLimit.toInt
- val manyEcho = for (i <- 1 to limit) yield echo
+ val manyEcho = for (i <- 1 to limit) yield echoActionName
wsk.action.create(xName, Some(manyEcho.mkString(",")), kind =
Some("sequence"), update = true)
@@ -224,19 +225,20 @@ abstract class WskSequenceTests extends TestHelpers with
ScalatestRouteTest with
it should "create and run a sequence in a package with parameters" in
withAssetCleaner(wskprops) {
(wp, assetHelper) =>
- val sName = "sSequence"
+ val sName = withTimestamp("sSequence")
// create a package
- val pkgName = "echopackage"
+ val pkgName = withTimestamp("echopackage")
val pkgStr = "LonelyPackage"
assetHelper.withCleaner(wsk.pkg, pkgName) { (pkg, name) =>
pkg.create(name, Map("payload" -> JsString(pkgStr)))
}
- val helloName = "hello"
- val helloWithPkg = s"$pkgName/$helloName"
+ val hello = "hello"
+ val helloActionName = withTimestamp(s"$hello")
+ val helloWithPkg = s"$pkgName/$helloActionName"
// create hello action in package
- val file = TestUtils.getTestActionFilename(s"$helloName.js")
+ val file = TestUtils.getTestActionFilename(s"$hello.js")
val actionStr = "AtomicAction"
assetHelper.withCleaner(wsk.action, helloWithPkg) { (action, actionName)
=>
action.create(
@@ -274,9 +276,9 @@ abstract class WskSequenceTests extends TestHelpers with
ScalatestRouteTest with
it should "run a sequence with an action in a package binding with
parameters" in withAssetCleaner(wskprops) {
(wp, assetHelper) =>
- val packageName = "package1"
- val bindName = "package2"
- val actionName = "print"
+ val packageName = withTimestamp("package1")
+ val bindName = withTimestamp("package2")
+ val actionName = withTimestamp("print")
val packageActionName = packageName + "/" + actionName
val bindActionName = bindName + "/" + actionName
val packageParams = Map("key1a" -> "value1a".toJson, "key1b" ->
"value1b".toJson)
@@ -313,21 +315,22 @@ abstract class WskSequenceTests extends TestHelpers with
ScalatestRouteTest with
*/
it should "stop execution of a sequence (with no payload) on error" in
withAssetCleaner(wskprops) {
(wp, assetHelper) =>
- val sName = "sSequence"
+ val sName = withTimestamp("sSequence")
val apperror = "applicationError"
val echo = "echo"
// create actions
val actions = Seq(apperror, echo)
+ val actionNames = actions.map(a => (a -> withTimestamp(a))).toMap
for (actionName <- actions) {
val file = TestUtils.getTestActionFilename(s"$actionName.js")
- assetHelper.withCleaner(wsk.action, actionName) { (action, actionName)
=>
- action.create(name = actionName, artifact = Some(file), timeout =
Some(allowedActionDuration))
+ assetHelper.withCleaner(wsk.action, actionNames(actionName)) {
(action, name) =>
+ action.create(name = name, artifact = Some(file), timeout =
Some(allowedActionDuration))
}
}
// create sequence s
assetHelper.withCleaner(wsk.action, sName) { (action, seqName) =>
- action.create(seqName, artifact = Some(actions.mkString(",")), kind =
Some("sequence"))
+ action.create(seqName, artifact =
Some(actionNames.values.mkString(",")), kind = Some("sequence"))
}
// run sequence s with no payload
val run = wsk.action.invoke(sName)
@@ -348,23 +351,24 @@ abstract class WskSequenceTests extends TestHelpers with
ScalatestRouteTest with
*/
it should "propagate execution error (timeout) from atomic action to
sequence" in withAssetCleaner(wskprops) {
(wp, assetHelper) =>
- val sName = "sSequence"
+ val sName = withTimestamp("sSequence")
val initforever = "initforever"
val echo = "echo"
// create actions
val actions = Seq(echo, initforever)
+ val actionNames = actions.map(a => (a -> withTimestamp(a))).toMap
// timeouts for the action; make the one for initforever short
val timeout = Map(echo -> allowedActionDuration, initforever ->
shortDuration)
for (actionName <- actions) {
val file = TestUtils.getTestActionFilename(s"$actionName.js")
- assetHelper.withCleaner(wsk.action, actionName) { (action, actionName)
=>
- action.create(name = actionName, artifact = Some(file), timeout =
Some(timeout(actionName)))
+ assetHelper.withCleaner(wsk.action, actionNames(actionName)) {
(action, name) =>
+ action.create(name = name, artifact = Some(file), timeout =
Some(timeout(actionName)))
}
}
// create sequence s
assetHelper.withCleaner(wsk.action, sName) { (action, seqName) =>
- action.create(seqName, artifact = Some(actions.mkString(",")), kind =
Some("sequence"))
+ action.create(seqName, artifact =
Some(actionNames.values.mkString(",")), kind = Some("sequence"))
}
// run sequence s with no payload
val run = wsk.action.invoke(sName)
@@ -387,21 +391,22 @@ abstract class WskSequenceTests extends TestHelpers with
ScalatestRouteTest with
*/
it should "execute a sequence in blocking fashion and finish execution even
if longer than blocking response timeout" in withAssetCleaner(
wskprops) { (wp, assetHelper) =>
- val sName = "sSequence"
+ val sName = withTimestamp("sSequence")
val sleep = "timeout"
val echo = "echo"
// create actions
val actions = Seq(echo, sleep)
+ val actionNames = actions.map(a => (a -> withTimestamp(a))).toMap
for (actionName <- actions) {
val file = TestUtils.getTestActionFilename(s"$actionName.js")
- assetHelper.withCleaner(wsk.action, actionName) { (action, actionName) =>
- action.create(name = actionName, artifact = Some(file), timeout =
Some(allowedActionDuration))
+ assetHelper.withCleaner(wsk.action, actionNames(actionName)) { (action,
name) =>
+ action.create(name = name, artifact = Some(file), timeout =
Some(allowedActionDuration))
}
}
// create sequence s
assetHelper.withCleaner(wsk.action, sName) { (action, seqName) =>
- action.create(seqName, artifact = Some(actions.mkString(",")), kind =
Some("sequence"))
+ action.create(seqName, artifact =
Some(actionNames.values.mkString(",")), kind = Some("sequence"))
}
// run sequence s with sleep equal to payload
val payload = 65000
@@ -429,10 +434,11 @@ abstract class WskSequenceTests extends TestHelpers with
ScalatestRouteTest with
*/
it should "execute a sequence that is part of a rule and pass the trigger
parameters to the sequence" in withAssetCleaner(
wskprops) { (wp, assetHelper) =>
- val seqName = "seqRule"
- val actionName = "echo"
- val triggerName = "trigSeq"
- val ruleName = "ruleSeq"
+ val seqName = withTimestamp("seqRule")
+ val echoaction = "echo"
+ val actionName = withTimestamp(s"$echoaction")
+ val triggerName = withTimestamp("trigSeq")
+ val ruleName = withTimestamp("ruleSeq")
val itIsNow = "it is now " + new Date()
// set up all entities
@@ -442,7 +448,7 @@ abstract class WskSequenceTests extends TestHelpers with
ScalatestRouteTest with
trigger.create(name, parameters = triggerPayload)
}
// action
- val file = TestUtils.getTestActionFilename(s"$actionName.js")
+ val file = TestUtils.getTestActionFilename(s"$echoaction.js")
assetHelper.withCleaner(wsk.action, actionName) { (action, actionName) =>
action.create(name = actionName, artifact = Some(file), timeout =
Some(allowedActionDuration))
}
----------------------------------------------------------------
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:
[email protected]
With regards,
Apache Git Services