From ad44bb5d96681b8aaed9deaf85ef2338d7360401 Mon Sep 17 00:00:00 2001 From: David Zafman Date: Mon, 4 Jan 2016 11:02:30 -0800 Subject: [PATCH] test: Fix ceph-objectstore-tool test due to recent changes Signed-off-by: David Zafman --- src/test/ceph_objectstore_tool.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py index 0d7f4a8bebe..060e1443924 100755 --- a/src/test/ceph_objectstore_tool.py +++ b/src/test/ceph_objectstore_tool.py @@ -887,17 +887,14 @@ def main(argv): ERRORS += test_failure(cmd, "stdin is a tty and no --file filename specified", tty=True) # Specify a bad --type - cmd = (CFSD_PREFIX + "--type foobar --op list --pgid {pg}").format(osd=ONEOSD, pg=ONEPG) + os.mkdir(OSDDIR + "/fakeosd") + cmd = ("./ceph-objectstore-tool --data-path " + OSDDIR + "/{osd} --type foobar --op list --pgid {pg}").format(osd="fakeosd", pg=ONEPG) ERRORS += test_failure(cmd, "Need a valid --type e.g. filestore, memstore, keyvaluestore") # Don't specify a data-path cmd = "./ceph-objectstore-tool --journal-path {dir}/{osd}.journal --type memstore --op list --pgid {pg}".format(dir=OSDDIR, osd=ONEOSD, pg=ONEPG) ERRORS += test_failure(cmd, "Must provide --data-path") - # Don't specify a journal-path for filestore - cmd = "./ceph-objectstore-tool --type filestore --data-path {dir}/{osd} --op list --pgid {pg}".format(dir=OSDDIR, osd=ONEOSD, pg=ONEPG) - ERRORS += test_failure(cmd, "Must provide --journal-path") - cmd = (CFSD_PREFIX + "--op remove").format(osd=ONEOSD) ERRORS += test_failure(cmd, "Must provide pgid") -- 2.47.3