From d3de0036b40ce5edda6a34db6391dd2e9dc055ba Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 8 Apr 2017 22:27:33 +0800 Subject: [PATCH] tests: ceph_objectstore_tool.py: kill all daemons init-ceph kills all daemons that can be identified by get_name_list() by default, so no need to list them explicitly. also, without this change, mgr is not stopped when the test finishes. Signed-off-by: Kefu Chai --- src/test/ceph_objectstore_tool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py index 2bbe1743b858..6ed596c8283f 100755 --- a/src/test/ceph_objectstore_tool.py +++ b/src/test/ceph_objectstore_tool.py @@ -399,7 +399,7 @@ CEPH_DIR = CEPH_BUILD_DIR + "/cot_dir" CEPH_CONF = os.path.join(CEPH_DIR, 'ceph.conf') def kill_daemons(): - call("{path}/init-ceph -c {conf} stop osd mon > /dev/null 2>&1".format(conf=CEPH_CONF, path=CEPH_BIN), shell=True) + call("{path}/init-ceph -c {conf} stop > /dev/null 2>&1".format(conf=CEPH_CONF, path=CEPH_BIN), shell=True) def check_data(DATADIR, TMPFILE, OSDDIR, SPLIT_NAME): -- 2.47.3