Preserve wsk list /_ compatibility to break circular dependence.

Remove redundant test. Fix go integration test.
apache · Jan 10, 2018 · a491ee2 · a491ee2
1 parent 2275197
commit a491ee2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/commands/namespace.go b/commands/namespace.go
@@ -70,9 +70,11 @@ var namespaceGetCmd = &cobra.Command{
         var err error
         var namespace string = getClientNamespace()
 
-        if whiskErr := CheckArgs(args,0,0,"Namespace get",
+        if (!(len(args) == 1 && args[0] == "/_")) {
+            if whiskErr := CheckArgs(args, 0, 0, "Namespace get",
                 wski18n.T("No arguments are required.")); whiskErr != nil {
-            return whiskErr
+                return whiskErr
+            }
         }
 
         actions, _, err := Client.Actions.List("", &whisk.ActionListOptions{ Skip: 0, Limit: 0 })

diff --git a/tests/src/integration/integration_test.go b/tests/src/integration/integration_test.go
@@ -139,8 +139,8 @@ func initInvalidArgs() {
             Err: tooManyArgsMsg + invalidArg + ". " + noArgsReqMsg,
         },
         common.InvalidArg {
-            Cmd: []string{"namespace", "get", "namespace", invalidArg},
-            Err: tooManyArgsMsg + invalidArg + ". " + optNamespaceMsg,
+            Cmd: []string{"namespace", "get", invalidArg},
+            Err: tooManyArgsMsg + invalidArg + ". " + noArgsReqMsg,
         },
         common.InvalidArg {
             Cmd: []string{"package", "create"},

diff --git a/tests/src/test/scala/system/basic/WskBasicTests.scala b/tests/src/test/scala/system/basic/WskBasicTests.scala
@@ -780,12 +780,6 @@ class WskBasicTests extends TestHelpers with WskTestHelpers {
     wsk.namespace.get(expectedExitCode = SUCCESS_EXIT)(WskProps()).stdout should include("default")
   }
 
-  it should "not accept a namespace on 'wsk list' or 'wsk namespace get'" in {
-    val namespace = "fakeNamespace"
-    val stderr = wsk.namespace.get(Some(s"/${namespace}"), expectedExitCode = MISUSE_EXIT).stderr
-    stderr should include(s"No arguments are required.'")
-  }
-
   behavior of "Wsk Activation CLI"
 
   it should "create a trigger, and fire a trigger to get its individual fields from an activation" in withAssetCleaner(

diff --git a/tests/src/test/scala/whisk/core/cli/test/WskBasicUsageTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskBasicUsageTests.scala
@@ -1632,7 +1632,7 @@ class WskBasicUsageTests 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", "namespace", invalidArg), s"${tooManyArgsMsg}${invalidArg}. ${optNamespaceMsg}"),
+      (Seq("namespace", "get", invalidArg), s"${tooManyArgsMsg}${invalidArg}. ${noArgsReqMsg}"),
       (Seq("package", "create"), s"${tooFewArgsMsg} ${packageNameReqMsg}"),
       (Seq("package", "create", "packageName", invalidArg), s"${tooManyArgsMsg}${invalidArg}."),
       (Seq("package", "create", "packageName", "--shared", invalidArg), invalidShared),