From bb1b635305a9624bc716093e35e707a94d79dea1 Mon Sep 17 00:00:00 2001 From: David Cariello Date: Fri, 14 Sep 2018 11:54:48 -0500 Subject: [PATCH] allow namespace invalid arg message to be overridden (#369) --- tests/src/test/scala/system/basic/WskCliBasicTests.scala | 1 - .../test/scala/whisk/core/cli/test/WskCliBasicUsageTests.scala | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/src/test/scala/system/basic/WskCliBasicTests.scala b/tests/src/test/scala/system/basic/WskCliBasicTests.scala index db617a63f..4b91d3ba0 100644 --- a/tests/src/test/scala/system/basic/WskCliBasicTests.scala +++ b/tests/src/test/scala/system/basic/WskCliBasicTests.scala @@ -67,7 +67,6 @@ class WskCliBasicTests extends TestHelpers with WskTestHelpers { it should "reject unauthenticated access" in { implicit val wskprops = WskProps("xxx") // shadow properties val errormsg = "The supplied authentication is invalid" - wsk.namespace.list(expectedExitCode = UNAUTHORIZED).stderr should include(errormsg) wsk.namespace.get(expectedExitCode = UNAUTHORIZED).stderr should include(errormsg) } diff --git a/tests/src/test/scala/whisk/core/cli/test/WskCliBasicUsageTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskCliBasicUsageTests.scala index 4e893dda4..38c68e87a 100644 --- a/tests/src/test/scala/whisk/core/cli/test/WskCliBasicUsageTests.scala +++ b/tests/src/test/scala/whisk/core/cli/test/WskCliBasicUsageTests.scala @@ -57,6 +57,7 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers { val wsk = new Wsk val defaultAction = Some(TestUtils.getTestActionFilename("hello.js")) val usrAgentHeaderRegEx = """\bUser-Agent\b": \[\s+"OpenWhisk\-CLI/1.\d+.*""" + val namespaceInvalidArgumentErrMsg = "error: Invalid argument(s): invalidArg. No arguments are required." // certain environments may return router IP address instead of api_host string causing a failure // Set apiHostCheck to false to avoid apihost check val apiHostCheck = true @@ -1969,7 +1970,7 @@ class WskCliBasicUsageTests extends TestHelpers with WskTestHelpers { (Seq("activation", "result", "activationID", invalidArg), s"${tooManyArgsMsg}${invalidArg}."), (Seq("activation", "poll", "activationID", invalidArg), s"${tooManyArgsMsg}${invalidArg}. ${optNamespaceMsg}"), (Seq("namespace", "list", invalidArg), s"${tooManyArgsMsg}${invalidArg}. ${noArgsReqMsg}"), - (Seq("namespace", "get", invalidArg), s"${tooManyArgsMsg}${invalidArg}. ${noArgsReqMsg}"), + (Seq("namespace", "get", invalidArg), s"${namespaceInvalidArgumentErrMsg}"), (Seq("package", "create"), s"${tooFewArgsMsg} ${packageNameReqMsg}"), (Seq("package", "create", "packageName", invalidArg), s"${tooManyArgsMsg}${invalidArg}."), (Seq("package", "create", "packageName", "--shared", invalidArg), invalidShared),