]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
tests: add setup/teardown for asok dir
authorKefu Chai <kchai@redhat.com>
Mon, 24 Jul 2017 08:31:06 +0000 (16:31 +0800)
committerKefu Chai <kchai@redhat.com>
Mon, 24 Jul 2017 08:39:17 +0000 (16:39 +0800)
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>
src/ceph-disk/tests/ceph-disk.sh

index f96a9e06d08110442c523c7d99092b8b188f1ca3..eaa1c45af15be2db7731332500c6733da0bfe247 100755 (executable)
@@ -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() {