diff options
Diffstat (limited to 'tests/basic/ec/ec-common')
-rw-r--r-- | tests/basic/ec/ec-common | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/tests/basic/ec/ec-common b/tests/basic/ec/ec-common index 0fddd35ac14..65422d72095 100644 --- a/tests/basic/ec/ec-common +++ b/tests/basic/ec/ec-common @@ -24,8 +24,11 @@ fi TEST glusterd TEST pidof glusterd TEST $CLI volume create $V0 redundancy $REDUNDANCY $H0:$B0/${V0}{0..$LAST_BRICK} +EXPECT 'Created' volinfo_field $V0 'Status' TEST $CLI volume start $V0 -TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 +EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Started' volinfo_field $V0 'Status' +TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-id=/$V0 --volfile-server=$H0 $M0 +EXPECT_WITHIN $CHILD_UP_TIMEOUT "$DISPERSE" ec_child_up_count $V0 0 TEST dd if=/dev/urandom of=$tmp/small bs=1024 count=1 TEST dd if=/dev/urandom of=$tmp/big bs=1024 count=4096 @@ -83,15 +86,9 @@ for dir in . dir1; do EXPECT "1024" stat -c "%s" $dir/small EXPECT "4194304" stat -c "%s" $dir/big - EXPECT "$cs_small" echo $(sha1sum $dir/small | awk '{ print $1 }') - EXPECT "$cs_big" echo $(sha1sum $dir/big | awk '{ print $1 }') - - cd - TEST umount $M0 - TEST $CLI volume stop $V0 force - TEST $CLI volume start $V0 - TEST glusterfs --volfile-id=/$V0 --volfile-server=$H0 $M0 --attribute-timeout=0 --entry-timeout=0 - cd $M0 + + 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 |