summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Hernandez <xhernandez@datalab.es>2014-11-20 11:58:16 +0100
committerVijay Bellur <vbellur@redhat.com>2014-11-24 10:45:42 -0800
commit69d4b53380e3fe10edd94cba22a36f5a5f303348 (patch)
tree60146a36bb3ef4e993a78fecc582369b3af5f111
parent66c789765d783bba8fe651e6a26feb5483af71a5 (diff)
Regression tests portability: Do not 'cd' into volume
Changing current directory to the root of the volume to execute tests from there keeps an open file descriptor to it that could interfere with some tests. I've removed all 'cd' and used abosulte paths on all tests. Change-Id: Ic54afb7d7974e9e80818201bcd99ee2b01d00442 BUG: 1129939 Signed-off-by: Xavier Hernandez <xhernandez@datalab.es> Reviewed-on: http://review.gluster.org/9151 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Emmanuel Dreyfus <manu@netbsd.org> Tested-by: Emmanuel Dreyfus <manu@netbsd.org>
-rw-r--r--tests/basic/ec/ec-common63
-rw-r--r--tests/basic/ec/self-heal.t69
2 files changed, 65 insertions, 67 deletions
diff --git a/tests/basic/ec/ec-common b/tests/basic/ec/ec-common
index 6453455ba98..83c4463a912 100644
--- a/tests/basic/ec/ec-common
+++ b/tests/basic/ec/ec-common
@@ -52,33 +52,32 @@ for idx in `seq 0 $LAST_BRICK`; do
brick[$idx]=$(gf_get_gfid_backend_file_path $B0/$V0$idx)
done
-cd $M0
-TEST stat .
-TEST mkdir dir1
-TEST [ -d dir1 ]
-TEST touch file1
-TEST [ -f file1 ]
+TEST stat $M0/
+TEST mkdir $M0/dir1
+TEST [ -d $M0/dir1 ]
+TEST touch $M0/file1
+TEST [ -f $M0/file1 ]
for dir in . dir1; do
- TEST cp $tmp/small $dir/small
- TEST [ -f $dir/small ]
+ TEST cp $tmp/small $M0/$dir/small
+ TEST [ -f $M0/$dir/small ]
fsize=$(fragment_size 1024)
- EXPECT "1024" stat -c "%s" $dir/small
+ EXPECT "1024" stat -c "%s" $M0/$dir/small
for idx in `seq 0 $LAST_BRICK`; do
EXPECT "$fsize" stat -c "%s" ${brick[$idx]}/$dir/small
done
- EXPECT "$cs_small" echo $(sha1sum $dir/small | awk '{ print $1 }')
+ EXPECT "$cs_small" echo $(sha1sum $M0/$dir/small | awk '{ print $1 }')
- TEST cp $tmp/big $dir/big
- TEST [ -f $dir/big ]
+ TEST cp $tmp/big $M0/$dir/big
+ TEST [ -f $M0/$dir/big ]
fsize=$(fragment_size 4194304)
- EXPECT "4194304" stat -c "%s" $dir/big
+ EXPECT "4194304" stat -c "%s" $M0/$dir/big
for idx in `seq 0 $LAST_BRICK`; do
EXPECT "$fsize" stat -c "%s" ${brick[$idx]}/$dir/big
done
- EXPECT "$cs_big" echo $(sha1sum $dir/big | awk '{ print $1 }')
+ EXPECT "$cs_big" echo $(sha1sum $M0/$dir/big | awk '{ print $1 }')
# Give enough time for current operations to complete. Otherwise the
# following kill_brick can cause data corruption and self-heal will be
@@ -88,55 +87,55 @@ for dir in . dir1; do
for idx in `seq 0 $LAST_BRICK`; do
TEST kill_brick $V0 $H0 $B0/$V0$idx
- EXPECT "1024" stat -c "%s" $dir/small
- EXPECT "4194304" stat -c "%s" $dir/big
+ EXPECT "1024" stat -c "%s" $M0/$dir/small
+ EXPECT "4194304" stat -c "%s" $M0/$dir/big
TEST $CLI volume start $V0 force
EXPECT_WITHIN $CHILD_UP_TIMEOUT "$DISPERSE" ec_child_up_count $V0 0
done
for size in $SIZE_LIST; do
- TEST truncate -s $size $dir/small
- TEST [ -f $dir/small ]
+ TEST truncate -s $size $M0/$dir/small
+ TEST [ -f $M0/$dir/small ]
fsize=$(fragment_size $size)
- EXPECT "$size" stat -c "%s" $dir/small
+ EXPECT "$size" stat -c "%s" $M0/$dir/small
for idx in `seq 0 $LAST_BRICK`; do
EXPECT "$fsize" stat -c "%s" ${brick[$idx]}/$dir/small
done
- EXPECT "${cs_small_truncate[$size]}" echo $(sha1sum $dir/small | awk '{ print $1 }')
+ EXPECT "${cs_small_truncate[$size]}" echo $(sha1sum $M0/$dir/small | awk '{ print $1 }')
- TEST truncate -s $size $dir/big
- TEST [ -f $dir/big ]
- EXPECT "$size" stat -c "%s" $dir/big
+ TEST truncate -s $size $M0/$dir/big
+ TEST [ -f $M0/$dir/big ]
+ EXPECT "$size" stat -c "%s" $M0/$dir/big
for idx in `seq 0 $LAST_BRICK`; do
EXPECT "$fsize" stat -c "%s" ${brick[$idx]}/$dir/big
done
- EXPECT "${cs_big_truncate[$size]}" echo $(sha1sum $dir/big | awk '{ print $1 }')
+ EXPECT "${cs_big_truncate[$size]}" echo $(sha1sum $M0/$dir/big | awk '{ print $1 }')
done
- TEST rm -f $dir/small
- TEST [ ! -e $dir/small ]
+ TEST rm -f $M0/$dir/small
+ TEST [ ! -e $M0/$dir/small ]
for idx in `seq 0 $LAST_BRICK`; do
TEST [ ! -e ${brick[$idx]}/$dir/small ]
done
- TEST rm -f $dir/big
- TEST [ ! -e $dir/big ]
+ TEST rm -f $M0/$dir/big
+ TEST [ ! -e $M0/$dir/big ]
for idx in `seq 0 $LAST_BRICK`; do
TEST [ ! -e ${brick[$idx]}/$dir/big ]
done
done
-TEST rmdir dir1
-TEST [ ! -e dir1 ]
+TEST rmdir $M0/dir1
+TEST [ ! -e $M0/dir1 ]
for idx in `seq 0 $LAST_BRICK`; do
TEST [ ! -e ${brick[$idx]}/dir1 ]
done
-TEST rm -f file1
-TEST [ ! -e file1 ]
+TEST rm -f $M0/file1
+TEST [ ! -e $M0/file1 ]
for idx in `seq 0 $LAST_BRICK`; do
TEST [ ! -e ${brick[$idx]}/file1 ]
done
diff --git a/tests/basic/ec/self-heal.t b/tests/basic/ec/self-heal.t
index 3808fb49a97..98dd9232c73 100644
--- a/tests/basic/ec/self-heal.t
+++ b/tests/basic/ec/self-heal.t
@@ -10,7 +10,7 @@ cleanup
function check_mount_dir
{
for i in {1..20}; do
- ls -l | grep "dir1"
+ ls -l $M0/ | grep "dir1"
if [ $? -ne 0 ]; then
return 1
fi
@@ -21,7 +21,7 @@ function check_mount_dir
function check_size
{
- stat $1
+ stat $M0/$1
for i in "${brick[@]}"; do
res=`stat -c "%s" $i/$1`
if [ "$res" != "$2" ]; then
@@ -35,7 +35,7 @@ function check_size
function check_mode
{
- stat $1
+ stat $M0/$1
for i in "${brick[@]}"; do
res=`stat -c "%A" $i/$1`
if [ "$res" != "$2" ]; then
@@ -49,7 +49,7 @@ function check_mode
function check_date
{
- stat $1
+ stat $M0/$1
for i in "${brick[@]}"; do
res=`stat -c "%Y" $i/$1`
if [ "$res" != "$2" ]; then
@@ -63,7 +63,7 @@ function check_date
function check_xattr
{
- stat $1
+ stat $M0/$1
for i in "${brick[@]}"; do
getfattr -n $2 $i/$1 2>/dev/null
if [ $? -eq 0 ]; then
@@ -77,7 +77,7 @@ function check_xattr
function check_dir
{
- getfattr -m. -d dir1
+ getfattr -m. -d $M0/dir1
for i in "${brick[@]}"; do
if [ ! -d $i/dir1 ]; then
echo "N"
@@ -90,7 +90,7 @@ function check_dir
function check_soft_link
{
- stat test3
+ stat $M0/test3
for i in "${brick[@]}"; do
if [ ! -h $i/test3 ]; then
echo "N"
@@ -103,9 +103,10 @@ function check_soft_link
function check_hard_link
{
- stat test4
+ stat $M0/test4
for i in "${brick[@]}"; do
- if [ `stat -c "%h" $i/test4` -ne 3 ]; then
+ res=`stat -c "%h" $i/test4`
+ if [ "$res" != "3" ]; then
echo "N"
return 0
fi
@@ -142,19 +143,17 @@ for idx in {0..5}; do
brick[$idx]=$(gf_get_gfid_backend_file_path $B0/$V0$idx)
done
-
-cd $M0
-TEST cp $tmp/test test
-TEST chmod 644 test
-TEST touch -d "@946681200" test
-EXPECT "-rw-r--r--" stat -c "%A" test
-EXPECT "946681200" stat -c "%Y" test
+TEST cp $tmp/test $M0/test
+TEST chmod 644 $M0/test
+TEST touch -d "@946681200" $M0/test
+EXPECT "-rw-r--r--" stat -c "%A" $M0/test
+EXPECT "946681200" stat -c "%Y" $M0/test
for idx1 in {0..5}; do
TEST chmod 666 ${brick[$idx1]}/test
TEST truncate -s 0 ${brick[$idx1]}/test
TEST setfattr -n user.test -v "test1" ${brick[$idx1]}/test
- EXPECT "-rw-r--r--" stat -c "%A" test
+ EXPECT "-rw-r--r--" stat -c "%A" $M0/test
EXPECT_WITHIN $HEAL_TIMEOUT "Y" check_size test "262144"
EXPECT_WITHIN $HEAL_TIMEOUT "Y" check_mode test "-rw-r--r--"
EXPECT_WITHIN $HEAL_TIMEOUT "Y" check_date test "946681200"
@@ -170,7 +169,7 @@ for idx1 in {0..4}; do
TEST truncate -s 2097152 ${brick[$idx2]}/test
TEST setfattr -n user.test -v "test1" ${brick[$idx1]}/test
TEST setfattr -n user.test -v "test2" ${brick[$idx2]}/test
- EXPECT "-rw-r--r--" stat -c "%A" test
+ EXPECT "-rw-r--r--" stat -c "%A" $M0/test
EXPECT_WITHIN $HEAL_TIMEOUT "Y" check_size test "262144"
EXPECT_WITHIN $HEAL_TIMEOUT "Y" check_mode test "-rw-r--r--"
EXPECT_WITHIN $HEAL_TIMEOUT "Y" check_date test "946681200"
@@ -183,21 +182,21 @@ sleep 2
TEST kill_brick $V0 $H0 $B0/${V0}0
TEST kill_brick $V0 $H0 $B0/${V0}1
-TEST cp $tmp/test test2
-EXPECT "1048576" stat -c "%s" test2
-TEST chmod 777 test2
-EXPECT "-rwxrwxrwx" stat -c "%A" test2
+TEST cp $tmp/test $M0/test2
+EXPECT "1048576" stat -c "%s" $M0/test2
+TEST chmod 777 $M0/test2
+EXPECT "-rwxrwxrwx" stat -c "%A" $M0/test2
-TEST mkdir dir1
-TEST ls -al dir1
+TEST mkdir $M0/dir1
+TEST ls -al $M0/dir1
-TEST ln -s test2 test3
-TEST [ -h test3 ]
+TEST ln -s test2 $M0/test3
+TEST [ -h $M0/test3 ]
-TEST ln test2 test4
-TEST [ -f test4 ]
-EXPECT "2" stat -c "%h" test2
-EXPECT "2" stat -c "%h" test4
+TEST ln $M0/test2 $M0/test4
+TEST [ -f $M0/test4 ]
+EXPECT "2" stat -c "%h" $M0/test2
+EXPECT "2" stat -c "%h" $M0/test4
sleep 2
@@ -208,18 +207,18 @@ EXPECT_WITHIN $CHILD_UP_TIMEOUT "6" ec_child_up_count $V0 0
TEST check_mount_dir
-EXPECT "1048576" stat -c "%s" test2
-EXPECT "-rwxrwxrwx" stat -c "%A" test2
+EXPECT "1048576" stat -c "%s" $M0/test2
+EXPECT "-rwxrwxrwx" stat -c "%A" $M0/test2
EXPECT_WITHIN $HEAL_TIMEOUT "Y" check_size test2 "262144"
EXPECT_WITHIN $HEAL_TIMEOUT "Y" check_mode test2 "-rwxrwxrwx"
-TEST ls -al dir1
+TEST ls -al $M0/dir1
EXPECT_WITHIN $HEAL_TIMEOUT "Y" check_dir
-TEST [ -h test3 ]
+TEST [ -h $M0/test3 ]
EXPECT_WITHIN $HEAL_TIMEOUT "Y" check_soft_link
-EXPECT "2" stat -c "%h" test4
+EXPECT "2" stat -c "%h" $M0/test4
EXPECT_WITHIN $HEAL_TIMEOUT "Y" check_hard_link
TEST rm -rf $tmp