From: Loic Dachary <ldachary@redhat.com>
Date: Thu, 13 Nov 2014 16:32:14 +0000 (+0100)
Subject: tests: ceph_objectstore_tool.py replace stop.sh with init-ceph
X-Git-Tag: v0.80.10~69^2~48
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=04e480b09b59f5318e9b206e6c3e529d8bb22328;p=ceph.git

tests: ceph_objectstore_tool.py replace stop.sh with init-ceph

The stop.sh will stop all ceph-* processes. Use the init-ceph script
instead to selectively kill the daemons run by the vstart.sh cluster
used for ceph_objectstore_tool.

Signed-off-by: Loic Dachary <ldachary@redhat.com>
(cherry picked from commit e8f34bd62bf282144b8851fb9764cf4429a49c25)
---

diff --git a/src/test/ceph_objectstore_tool.py b/src/test/ceph_objectstore_tool.py
index 10ad79d331a5..a83092558882 100755
--- a/src/test/ceph_objectstore_tool.py
+++ b/src/test/ceph_objectstore_tool.py
@@ -372,7 +372,7 @@ def main(argv):
 
     logging.debug(db)
 
-    call("./stop.sh", stderr=nullfd)
+    call("./init-ceph -c {conf} stop osd mon".format(conf=CEPH_CONF), shell=True)
 
     if ERRORS:
         logging.critical("Unable to set up test")
@@ -753,7 +753,7 @@ def main(argv):
     else:
         logging.warning("SKIPPING IMPORT-RADOS TESTS DUE TO PREVIOUS FAILURES")
 
-    call("./stop.sh", stderr=nullfd)
+    call("./init-ceph -c {conf} stop osd mon".format(conf=CEPH_CONF), shell=True)
 
     call("/bin/rm -rf {dir}".format(dir=TESTDIR), shell=True)
     call("/bin/rm -rf {dir}".format(dir=DATADIR), shell=True)