rabbah commented on a change in pull request #2996: Rewrite WskBasicUsageTests
URL:
https://github.com/apache/incubator-openwhisk/pull/2996#discussion_r160849404
##########
File path: tests/src/test/scala/whisk/core/cli/test/WskBasicUsageTests.scala
##########
@@ -1133,81 +699,33 @@ class WskBasicUsageTests extends TestHelpers with
WskTestHelpers {
}
try {
- wsk.trigger.create(triggerName, feed = Some(actionName)).stdout should
include(""""lifecycleEvent": "CREATE"""")
+ wsk.trigger.create(triggerName, feed = Some(actionName)).statusCode
shouldBe OK
- wsk.trigger.get(triggerName).stdout should include(""""lifecycleEvent":
"READ"""")
+ wsk.trigger.get(triggerName).statusCode shouldBe OK
} finally {
- wsk.trigger.delete(triggerName).stdout should
include(""""lifecycleEvent": "DELETE"""")
+ wsk.trigger.delete(triggerName).statusCode shouldBe OK
}
}
- it should "denote bound trigger parameters for trigger summaries" in
withAssetCleaner(wskprops) { (wp, assetHelper) =>
- val trgBoundParams = "trgBoundParams"
- val trgParamAnnot = "trgParamAnnot"
- val trgParamOverlap = "trgParamOverlap"
- val trgParamBound = "trgParamBound"
- val trgAnnots = Map(
- "parameters" -> JsArray(
- JsObject("name" -> JsString(trgParamAnnot), "description" ->
JsString("Annotated")),
- JsObject("name" -> JsString(trgParamOverlap), "description" ->
JsString("Annotated And Bound"))))
- val trgParamsBound = Map(trgParamBound -> JsString("Bound"),
trgParamOverlap -> JsString("Bound And Annotated"))
-
- assetHelper.withCleaner(wsk.trigger, trgBoundParams) { (trigger, _) =>
- trigger.create(trgBoundParams, annotations = trgAnnots, parameters =
trgParamsBound)
- }
-
- val trgStdoutBound = wsk.trigger.get(trgBoundParams, summary = true).stdout
-
- trgStdoutBound should include(s"(parameters: $trgParamAnnot,
*$trgParamBound, *$trgParamOverlap)")
- }
-
- it should "create, and get a trigger summary without a description and/or
parameters" in withAssetCleaner(wskprops) {
- (wp, assetHelper) =>
- val trgNoDesc = "trgNoDesc"
- val trgNoParams = "trgNoParams"
- val trgNoDescOrParams = "trgNoDescOrParams"
- val trgDesc = "Package description"
- val descFromParams = "Returns a result based on parameters"
- val namespace = wsk.namespace.whois()
- val qualtrgNoDesc = s"/${namespace}/${trgNoDesc}"
- val qualtrgNoParams = s"/${namespace}/${trgNoParams}"
- val qualtrgNoDescOrParams = s"/${namespace}/${trgNoDescOrParams}"
-
- val trgAnnotsNoParams = Map("description" -> JsString(trgDesc))
- val trgAnnotsNoDesc = Map(
- "parameters" -> JsArray(
- JsObject("name" -> JsString("paramName1"), "description" ->
JsString("Parameter description 1")),
- JsObject("name" -> JsString("paramName2"), "description" ->
JsString("Parameter description 2"))))
-
- assetHelper.withCleaner(wsk.trigger, trgNoDesc) { (trigger, _) =>
- trigger.create(trgNoDesc, annotations = trgAnnotsNoDesc)
- }
- assetHelper.withCleaner(wsk.trigger, trgNoParams) { (trigger, _) =>
- trigger.create(trgNoParams, annotations = trgAnnotsNoParams)
- }
- assetHelper.withCleaner(wsk.trigger, trgNoDescOrParams) { (trigger, _) =>
- trigger.create(trgNoDescOrParams)
- }
-
- val stdoutNoDescPkg = wsk.trigger.get(trgNoDesc, summary = true).stdout
- val stdoutNoParamsPkg = wsk.trigger.get(trgNoParams, summary =
true).stdout
- val stdoutNoDescOrParams = wsk.trigger.get(trgNoDescOrParams, summary =
true).stdout
-
- stdoutNoDescPkg should include regex (s"(?i)trigger ${qualtrgNoDesc}:
${descFromParams} paramName1 and paramName2\\s*\\(parameters: paramName1,
paramName2\\)")
- stdoutNoParamsPkg should include regex (s"(?i)trigger
${qualtrgNoParams}: ${trgDesc}\\s*\\(parameters: none defined\\)")
- stdoutNoDescOrParams should include regex (s"(?i)trigger
${qualtrgNoDescOrParams}\\s*\\(parameters: none defined\\)")
- }
-
behavior of "Wsk entity list formatting"
it should "create, and list a package with a long name" in
withAssetCleaner(wskprops) { (wp, assetHelper) =>
val name = "x" * 70
assetHelper.withCleaner(wsk.pkg, name) { (pkg, _) =>
pkg.create(name)
}
- retry({
- wsk.pkg.list().stdout should include(s"$name private")
- }, 5, Some(1 second))
+ retry(
+ {
+ val packs = wsk.pkg.list()
+ val packages = packs.getBodyListJsObject()
+ packages.exists(
+ pack =>
+ RestResult.getField(pack, "name") == name && RestResult
+ .getFieldJsValue(pack, "publish")
+ .toString == "false") shouldBe true
+ },
+ 5,
+ Some(1 second))
}
it should "create, and list an action with a long name" in
withAssetCleaner(wskprops) { (wp, assetHelper) =>
Review comment:
and this one.
----------------------------------------------------------------
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
