You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/04/26 15:25:56 UTC
[GitHub] mdeuser closed pull request #285: Bump client to display numeric
codes correctly again.
mdeuser closed pull request #285: Bump client to display numeric codes correctly again.
URL: https://github.com/apache/incubator-openwhisk-cli/pull/285
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/build.gradle b/build.gradle
index bb47d344..177c8b23 100644
--- a/build.gradle
+++ b/build.gradle
@@ -24,7 +24,7 @@ dependencies {
build(['name':'golang.org/x/sys/unix', 'version':'7f918dd405547ecb864d14a8ecbbfe205b5f930f', 'transitive':false])
build(['name':'gopkg.in/yaml.v2', 'version':'cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b', 'transitive':false])
build(['name':'github.com/ghodss/yaml', 'version':'0ca9ea5df5451ffdf184b4428c902747c2c11cd7', 'transitive':false])
- build(['name':'github.com/apache/incubator-openwhisk-client-go/whisk','version':'3d62dac688b8efa88f924658a9ac8f1058fed4ea','transitive':false])
+ build(['name':'github.com/apache/incubator-openwhisk-client-go/whisk','version':'e452b524cd745f71c913c5acccf72a8daba6dc71','transitive':false])
// END - Imported from Godeps
test name:'github.com/stretchr/testify', version:'b91bfb9ebec76498946beb6af7c0230c7cc7ba6c', transitive:false //, tag: 'v1.2.0'
test name:'github.com/spf13/viper', version:'aafc9e6bc7b7bb53ddaa75a5ef49a17d6e654be5', transitive:false
diff --git a/tests/src/test/scala/system/basic/WskCliBasicTests.scala b/tests/src/test/scala/system/basic/WskCliBasicTests.scala
index cf964e5d..283e4018 100644
--- a/tests/src/test/scala/system/basic/WskCliBasicTests.scala
+++ b/tests/src/test/scala/system/basic/WskCliBasicTests.scala
@@ -158,20 +158,20 @@ class WskCliBasicTests extends TestHelpers with WskTestHelpers {
}
val stderr = wsk.pkg.create(name, expectedExitCode = CONFLICT).stderr
- stderr should include regex (s"""Unable to create package '$name': resource already exists \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to create package '$name': resource already exists \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject delete of package that does not exist" in {
val name = "nonexistentPackage"
val stderr = wsk.pkg.delete(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to delete package '$name'. The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to delete package '$name'. The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject get of package that does not exist" in {
val name = "nonexistentPackage"
val ns = wsk.namespace.whois()
val stderr = wsk.pkg.get(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to get package '$name': ${Messages.resourceDoesntExist(s"${ns}/${name}")} \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to get package '$name': ${Messages.resourceDoesntExist(s"${ns}/${name}")} \\(code [0-9a-zA-Z_-]+\\)""")
}
behavior of "Wsk Action CLI"
@@ -214,25 +214,25 @@ class WskCliBasicTests extends TestHelpers with WskTestHelpers {
}
val stderr = wsk.action.create(name, file, expectedExitCode = CONFLICT).stderr
- stderr should include regex (s"""Unable to create action '$name': resource already exists \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to create action '$name': resource already exists \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject delete of action that does not exist" in {
val name = "nonexistentAction"
val stderr = wsk.action.delete(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to delete action '$name'. The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to delete action '$name'. The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject invocation of action that does not exist" in {
val name = "nonexistentAction"
val stderr = wsk.action.invoke(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to invoke action '$name': The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to invoke action '$name': The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject get of an action that does not exist" in {
val name = "nonexistentAction"
val stderr = wsk.action.get(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to get action '$name': The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to get action '$name': The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "create, and invoke an action that utilizes a docker container" in withAssetCleaner(wskprops) {
@@ -664,25 +664,25 @@ class WskCliBasicTests extends TestHelpers with WskTestHelpers {
}
val stderr = wsk.trigger.create(name, expectedExitCode = CONFLICT).stderr
- stderr should include regex (s"""Unable to create trigger '$name': resource already exists \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to create trigger '$name': resource already exists \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject delete of trigger that does not exist" in {
val name = "nonexistentTrigger"
val stderr = wsk.trigger.delete(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to get trigger '$name'. The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to get trigger '$name'. The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject get of trigger that does not exist" in {
val name = "nonexistentTrigger"
val stderr = wsk.trigger.get(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to get trigger '$name': The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to get trigger '$name': The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject firing of a trigger that does not exist" in {
val name = "nonexistentTrigger"
val stderr = wsk.trigger.fire(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to fire trigger '$name': The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to fire trigger '$name': The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "create and fire a trigger with a rule whose action has been deleted" in withAssetCleaner(wskprops) {
@@ -868,37 +868,37 @@ class WskCliBasicTests extends TestHelpers with WskTestHelpers {
val stderr =
wsk.rule.create(ruleName, trigger = triggerName, action = actionName, expectedExitCode = CONFLICT).stderr
- stderr should include regex (s"""Unable to create rule '$ruleName': resource already exists \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to create rule '$ruleName': resource already exists \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject delete of rule that does not exist" in {
val name = "nonexistentRule"
val stderr = wsk.rule.delete(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to delete rule '$name'. The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to delete rule '$name'. The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject enable of rule that does not exist" in {
val name = "nonexistentRule"
val stderr = wsk.rule.enable(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to enable rule '$name': The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to enable rule '$name': The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject disable of rule that does not exist" in {
val name = "nonexistentRule"
val stderr = wsk.rule.disable(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to disable rule '$name': The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to disable rule '$name': The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject status of rule that does not exist" in {
val name = "nonexistentRule"
val stderr = wsk.rule.state(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to get status of rule '$name': The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to get status of rule '$name': The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject get of rule that does not exist" in {
val name = "nonexistentRule"
val stderr = wsk.rule.get(name, expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to get rule '$name': The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to get rule '$name': The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
behavior of "Wsk Namespace CLI"
@@ -955,19 +955,19 @@ class WskCliBasicTests extends TestHelpers with WskTestHelpers {
it should "reject get of activation that does not exist" in {
val name = "0" * 32
val stderr = wsk.activation.get(Some(name), expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to get activation '$name': The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to get activation '$name': The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject logs of activation that does not exist" in {
val name = "0" * 32
val stderr = wsk.activation.logs(Some(name), expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to get logs for activation '$name': The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to get logs for activation '$name': The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject result of activation that does not exist" in {
val name = "0" * 32
val stderr = wsk.activation.result(Some(name), expectedExitCode = NOT_FOUND).stderr
- stderr should include regex (s"""Unable to get result for activation '$name': The requested resource does not exist. \\(code \\d+\\)""")
+ stderr should include regex (s"""Unable to get result for activation '$name': The requested resource does not exist. \\(code [0-9a-zA-Z_-]+\\)""")
}
it should "reject activation request when using activation ID with --last Flag" in withAssetCleaner(wskprops) {
----------------------------------------------------------------
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