clitest: Fix tests after osdmaptool --clobber bugfix.

Commit 5c8146b55dbd60bdfa47b53b93f2769f7d0524dc fixed clobber,
adjust clitests to match. Reordered test logic to have "fsid
does not change" check cover a run without --clobber.

Signed-off-by: Tommi Virtanen <tommi.virtanen@dreamhost.com>

diff --git a/src/test/cli/osdmaptool/clobber.t b/src/test/cli/osdmaptool/clobber.t
index 1c9f9c8fa37019bbc198a65e11f9c85e6ff77331..1df943dac3a81167a37a93693a8036c31a540953 100644 (file)
--- a/src/test/cli/osdmaptool/clobber.t
+++ b/src/test/cli/osdmaptool/clobber.t
@@ -1,24 +1,16 @@
-# TODO it seems osdmaptool refuses to create files at all without --clobber
   $ osdmaptool --createsimple 3 myosdmap
   osdmaptool: osdmap file 'myosdmap'
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open myosdmap: error 2: No such file or directory (re)
-  osdmaptool: couldn't open myosdmap: error 2: No such file or directory
-  [255]
-
-  $ osdmaptool --createsimple 3 --clobber myosdmap
-  osdmaptool: osdmap file 'myosdmap'
   osdmaptool: writing epoch 1 to myosdmap
 
-# TODO it seems osdmaptool will happily overwrite without --clobber
+  $ ORIG_FSID="$(osdmaptool --print myosdmap|grep ^fsid)"
+
   $ osdmaptool --createsimple 3 myosdmap
   osdmaptool: osdmap file 'myosdmap'
-  osdmaptool: writing epoch 1 to myosdmap
-
-  $ ORIG_FSID="$(osdmaptool --print myosdmap|grep ^fsid)"
+  osdmaptool: myosdmap exists, --clobber to overwrite
+  [255]
 
 # hasn't changed yet
 #TODO typo
-#TODO this one has so many pg_pools only because the above --clobber appended instead of overwriting?
   $ osdmaptool --print myosdmap
   osdmaptool: osdmap file 'myosdmap'
   epoch 1
@@ -31,10 +23,6 @@
   pg_pool 1 'metadata' pg_pool(rep pg_size 2 crush_ruleset 1 object_hash rjenkins pg_num 192 pgp_num 192 lpg_num 2 lpgp_num 2 last_change 0 owner 0)
   pg_pool 2 'casdata' pg_pool(rep pg_size 2 crush_ruleset 2 object_hash rjenkins pg_num 192 pgp_num 192 lpg_num 2 lpgp_num 2 last_change 0 owner 0)
   pg_pool 3 'rbd' pg_pool(rep pg_size 2 crush_ruleset 3 object_hash rjenkins pg_num 192 pgp_num 192 lpg_num 2 lpgp_num 2 last_change 0 owner 0)
-  pg_pool 4 'data' pg_pool(rep pg_size 2 crush_ruleset 0 object_hash rjenkins pg_num 192 pgp_num 192 lpg_num 2 lpgp_num 2 last_change 0 owner 0)
-  pg_pool 5 'metadata' pg_pool(rep pg_size 2 crush_ruleset 1 object_hash rjenkins pg_num 192 pgp_num 192 lpg_num 2 lpgp_num 2 last_change 0 owner 0)
-  pg_pool 6 'casdata' pg_pool(rep pg_size 2 crush_ruleset 2 object_hash rjenkins pg_num 192 pgp_num 192 lpg_num 2 lpgp_num 2 last_change 0 owner 0)
-  pg_pool 7 'rbd' pg_pool(rep pg_size 2 crush_ruleset 3 object_hash rjenkins pg_num 192 pgp_num 192 lpg_num 2 lpgp_num 2 last_change 0 owner 0)
   
   max_osd 3
   

diff --git a/src/test/cli/osdmaptool/create-print.t b/src/test/cli/osdmaptool/create-print.t
index 800d24826602f91658c7988ce9af58afcda717e0..8759cdd7ea6912176d76709e28d9dee18927a0fd 100644 (file)
--- a/src/test/cli/osdmaptool/create-print.t
+++ b/src/test/cli/osdmaptool/create-print.t
@@ -1,12 +1,5 @@
-# TODO it seems osdmaptool refuses to create files at all without --clobber
   $ osdmaptool --createsimple 3 myosdmap
   osdmaptool: osdmap file 'myosdmap'
-  \d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}\.\d+ [0-9a-f]{8,} can't open myosdmap: error 2: No such file or directory (re)
-  osdmaptool: couldn't open myosdmap: error 2: No such file or directory
-  [255]
-
-  $ osdmaptool --createsimple 3 --clobber myosdmap
-  osdmaptool: osdmap file 'myosdmap'
   osdmaptool: writing epoch 1 to myosdmap
 
   $ osdmaptool --print myosdmap