From: David Zafman <dzafman@redhat.com>
Date: Tue, 5 Jun 2018 18:01:37 +0000 (-0700)
Subject: test: Use a file that should be on all OSes
X-Git-Tag: v14.0.1~1156^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F22428%2Fhead;p=ceph.git

test: Use a file that should be on all OSes

Also, create temporary files in test specific dir and remove

Caused by: 154330fd68d952a4e1b972891f02b6dc9c355424

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

diff --git a/qa/standalone/scrub/osd-unexpected-clone.sh b/qa/standalone/scrub/osd-unexpected-clone.sh
index b969405f82b..bc9263ae32d 100755
--- a/qa/standalone/scrub/osd-unexpected-clone.sh
+++ b/qa/standalone/scrub/osd-unexpected-clone.sh
@@ -47,7 +47,7 @@ function TEST_recover_unexpected() {
     ceph osd pool create foo 1
     rados -p foo put foo /etc/passwd
     rados -p foo mksnap snap
-    rados -p foo put foo /etc/motd
+    rados -p foo put foo /etc/group
 
     wait_for_clean || return 1
 
@@ -55,16 +55,17 @@ function TEST_recover_unexpected() {
 
     JSON=`objectstore_tool $dir $osd --op list foo | grep snapid.:1`
     echo "JSON is $JSON"
-    rm -f _ data
-    objectstore_tool $dir $osd "$JSON" get-attr _ > _
-    objectstore_tool $dir $osd "$JSON" get-bytes data
+    rm -f $dir/_ $dir/data
+    objectstore_tool $dir $osd "$JSON" get-attr _ > $dir/_
+    objectstore_tool $dir $osd "$JSON" get-bytes $dir/data
 
     rados -p foo rmsnap snap
 
     sleep 5
 
-    objectstore_tool $dir $osd "$JSON" set-bytes data
-    objectstore_tool $dir $osd "$JSON" set-attr _ _
+    objectstore_tool $dir $osd "$JSON" set-bytes $dir/data
+    objectstore_tool $dir $osd "$JSON" set-attr _ $dir/_
+    rm -f $dir/_ $dir/data
 
     sleep 5