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 1f4ba29bdfbc444d0880c68c70fcf7884825bf43..bba8e9502e59842124b7d21814422170022fcac6 100755 (executable)
--- 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 bc9263ae32dff6d71b661cd9f6b452684851ddee..8f0472f0e89b00e91b5200d5c2fbb9e71098d1de 100755 (executable)
--- 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