]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
test_rados_tool.sh: fix xattr test
authorColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Tue, 23 Aug 2011 18:12:38 +0000 (11:12 -0700)
committerColin Patrick McCabe <cmccabe@alumni.cmu.edu>
Wed, 24 Aug 2011 01:12:26 +0000 (18:12 -0700)
Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>
src/test/test_rados_tool.sh

index c7c31c0dbc212f1742f09e60c2e35bb678378326..76911867be343760007da874769b5bbb832d12bc 100755 (executable)
@@ -111,8 +111,10 @@ run_expect_succ grep '\[force\]' "$TDIR/out2"
 run_expect_succ "$RADOS_TOOL" -C export "$POOL" "$TDIR/dirc_copy"
 
 # check to make sure extended attributes were preserved
-PRE_EXPORT=`attr -qg user.rados.toothbrush "$TDIR/dirc/foo"`
-POST_EXPORT=`attr -qg user.rados.toothbrush "$TDIR/dirc_copy/foo"`
+PRE_EXPORT=`attr -qg rados.toothbrush "$TDIR/dirc/foo"`
+[ $? -eq 0 ] || die "failed to get xattr"
+POST_EXPORT=`attr -qg rados.toothbrush "$TDIR/dirc_copy/foo"`
+[ $? -eq 0 ] || die "failed to get xattr"
 if [ "$PRE_EXPORT" != "$POST_EXPORT" ]; then
     die "xattr not preserved across import/export! \
 \$PRE_EXPORT = $PRE_EXPORT, \$POST_EXPORT = $POST_EXPORT"
@@ -130,7 +132,7 @@ run_expect_succ grep '\[deleted\]' "$TDIR/out4"
 [ -e "$TDIR/dird/foo" ] && die "--delete-after failed to delete a file!"
 
 # test hashed pathnames
-mkdir "$TDIR/dird"
+mkdir -p "$TDIR/dird"
 attr -q -s "rados_sync_ver" -V "1" "$TDIR/dird"
 touch "$TDIR/dird/bar@bar_00000000000055ca"
 attr -q -s "rados_full_name" -V "bar/bar" "$TDIR/dird/bar@bar_00000000000055ca"