From: David Zafman <dzafman@redhat.com>
Date: Fri, 8 Jun 2018 18:45:18 +0000 (-0700)
Subject: test: Put files in private test directory
X-Git-Tag: v14.0.1~1091^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=39fc43556fb03d27bc1c12ff335c949e487f32a2;p=ceph.git

test: Put files in private test directory

Signed-off-by: David Zafman <dzafman@redhat.com>
---

diff --git a/qa/standalone/osd/repro_long_log.sh b/qa/standalone/osd/repro_long_log.sh
index 1f4ba29bdfbc..bba8e9502e59 100755
--- a/qa/standalone/osd/repro_long_log.sh
+++ b/qa/standalone/osd/repro_long_log.sh
@@ -67,10 +67,10 @@ function setup_log_test() {
     ceph tell osd.\* injectargs -- --osd-pg-log-trim-min 10 || return 1
     ceph tell osd.\* injectargs -- --osd-pg-log-dups-tracked 10 || return 1
 
-    touch foo
+    touch $dir/foo
     for i in $(seq 1 20)
     do
-        rados -p test put foo foo || return 1
+        rados -p test put foo $dir/foo || return 1
     done
 
     test_log_size $PGID 20 || return 1
@@ -93,7 +93,7 @@ function TEST_repro_long_log1()
 
     setup_log_test $dir || return 1
     # regular write should trim the log
-    rados -p test put foo foo || return 1
+    rados -p test put foo $dir/foo || return 1
     test_log_size $PGID 22 || return 1
 }
 
diff --git a/qa/standalone/scrub/osd-unexpected-clone.sh b/qa/standalone/scrub/osd-unexpected-clone.sh
index bc9263ae32df..8f0472f0e89b 100755
--- a/qa/standalone/scrub/osd-unexpected-clone.sh
+++ b/qa/standalone/scrub/osd-unexpected-clone.sh
@@ -65,7 +65,6 @@ function TEST_recover_unexpected() {
 
     objectstore_tool $dir $osd "$JSON" set-bytes $dir/data
     objectstore_tool $dir $osd "$JSON" set-attr _ $dir/_
-    rm -f $dir/_ $dir/data
 
     sleep 5