diff options
| author | Sage Weil <sage@inktank.com> | 2013-11-07 04:59:56 +0100 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-11-07 04:59:56 +0100 |
| commit | 1ee112fa2efcf743c3f0451d73386d3364b59f1a (patch) | |
| tree | 7fc64116816814dcbb3f2f5a5fdf5aca79f5f8df | |
| parent | Ceph: Fix memory leak in chain_flistxattr() (diff) | |
| download | ceph-1ee112fa2efcf743c3f0451d73386d3364b59f1a.tar.xz ceph-1ee112fa2efcf743c3f0451d73386d3364b59f1a.zip | |
osdmaptool: fix cli tests
From c22c84a88c22688b6044ab37f65a3fe40dfe1983.
Signed-off-by: Sage Weil <sage@inktank.com>
| -rw-r--r-- | src/test/cli/osdmaptool/clobber.t | 3 | ||||
| -rw-r--r-- | src/test/cli/osdmaptool/create-racks.t | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/test/cli/osdmaptool/clobber.t b/src/test/cli/osdmaptool/clobber.t index 9bbe4d4ceeb..bbec5f0de63 100644 --- a/src/test/cli/osdmaptool/clobber.t +++ b/src/test/cli/osdmaptool/clobber.t @@ -3,6 +3,7 @@ osdmaptool: writing epoch 1 to myosdmap $ ORIG_FSID="$(osdmaptool --print myosdmap|grep ^fsid)" + osdmaptool: osdmap file 'myosdmap' $ osdmaptool --createsimple 3 myosdmap osdmaptool: osdmap file 'myosdmap' @@ -27,6 +28,7 @@ $ NEW_FSID="$(osdmaptool --print myosdmap|grep ^fsid)" + osdmaptool: osdmap file 'myosdmap' $ [ "$ORIG_FSID" = "$NEW_FSID" ] $ osdmaptool --createsimple 1 --clobber myosdmap @@ -49,6 +51,7 @@ $ NEW_FSID="$(osdmaptool --print myosdmap|grep ^fsid)" + osdmaptool: osdmap file 'myosdmap' #TODO --clobber should probably set new fsid, remove the [1] $ [ "$ORIG_FSID" != "$NEW_FSID" ] [1] diff --git a/src/test/cli/osdmaptool/create-racks.t b/src/test/cli/osdmaptool/create-racks.t index 92bc995a227..f686ef4c051 100644 --- a/src/test/cli/osdmaptool/create-racks.t +++ b/src/test/cli/osdmaptool/create-racks.t @@ -1,4 +1,5 @@ $ osdmaptool --create-from-conf om -c $TESTDIR/ceph.conf.withracks > /dev/null + osdmaptool: osdmap file 'om' $ osdmaptool --test-map-pg 0.0 om osdmaptool: osdmap file 'om' parsed '0.0' -> 0.0 |