From: Kefu Chai <kchai@redhat.com>
Date: Mon, 24 Jul 2017 08:31:06 +0000 (+0800)
Subject: tests: add setup/teardown for asok dir
X-Git-Tag: v12.1.2~154^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b0bd816dd102e79ff3ac45d731916eb388bf5690;p=ceph.git

tests: add setup/teardown for asok dir

ceph-disk.sh has its own setup/teardown, so update them also. so asok
files will have their parent directory when being created.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/ceph-disk/tests/ceph-disk.sh b/src/ceph-disk/tests/ceph-disk.sh
index f96a9e06d081..eaa1c45af15b 100755
--- a/src/ceph-disk/tests/ceph-disk.sh
+++ b/src/ceph-disk/tests/ceph-disk.sh
@@ -60,6 +60,7 @@ function setup() {
     local dir=$1
     teardown $dir
     mkdir -p $dir/osd
+    mkdir -p $(get_asok_dir)
     touch $dir/ceph.conf # so ceph-disk think ceph is the cluster
 }
 
@@ -78,6 +79,7 @@ function teardown() {
         umount $mounted
     done
     rm -fr $dir
+    rm -rf $(get_asok_dir)
 }
 
 function command_fixture() {