From: Ilya Dryomov <idryomov@gmail.com>
Date: Mon, 30 Nov 2015 15:36:43 +0000 (+0100)
Subject: tests: update unmap.t CLI test
X-Git-Tag: v10.0.1~11^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1c8468168c7ce4b9eea83b28651c1cb79638cf55;p=ceph.git

tests: update unmap.t CLI test

Fixup the exit code - the old CLI tried to differentiate between CLI
errors and action errors by returning EXIT_FAILURE in the former case.
Also remove a test that relied on a special case check in the old CLI.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/src/test/cli-integration/rbd/unmap.t b/src/test/cli-integration/rbd/unmap.t
index 55496618a6cb..0af34bf999b6 100644
--- a/src/test/cli-integration/rbd/unmap.t
+++ b/src/test/cli-integration/rbd/unmap.t
@@ -220,15 +220,11 @@ Not a mapped spec - spec that's just been unmapped:
   rbd: unmap failed: (22) Invalid argument
   [22]
 
-Either --image or arg:
-
-  $ sudo rbd unmap --image foobar barbaz
-  rbd: extraneous parameter barbaz
-  [1]
+Need an arg:
 
   $ sudo rbd unmap
   rbd: unmap requires either image name or device path
-  [1]
+  [22]
 
 
 Two images