summaryrefslogtreecommitdiffstats
path: root/tests/basic/ec/ec-common
diff options
context:
space:
mode:
Diffstat (limited to 'tests/basic/ec/ec-common')
-rw-r--r--tests/basic/ec/ec-common17
1 files changed, 7 insertions, 10 deletions
diff --git a/tests/basic/ec/ec-common b/tests/basic/ec/ec-common
index 92e6499fa87..7abb4f2176d 100644
--- a/tests/basic/ec/ec-common
+++ b/tests/basic/ec/ec-common
@@ -23,8 +23,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 $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0;
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT 'Started' volinfo_field $V0 'Status'
+TEST $GFS --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
@@ -82,15 +85,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
- EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0
- TEST $CLI volume stop $V0 force
- TEST $CLI volume start $V0
- TEST $GFS --volfile-id=/$V0 --volfile-server=$H0 $M0;
- 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