diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2015-05-01 20:12:50 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2015-05-03 19:26:43 -0700 |
| commit | 7c4d103700f0bbe0c5e134f743a68f370e5600be (patch) | |
| tree | 29fd201a2513c6fe4809c91aae446f416d34197c | |
| parent | cff5db814ee31b556d321f7421cdb3fccc8c629d (diff) | |
tests: Fix spurious failures
- Use REBALANCE_TIMEOUT in EXPECT_WITHIN
- Use fdatasync to prevent write-behind from giving success
- Add logfile to glupy
Change-Id: I51ab51644aaa4aa9d49f185e7b8959bb58be966b
BUG: 1217766
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
Reviewed-on: http://review.gluster.org/10487
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
| -rw-r--r-- | tests/bugs/distribute/bug-1122443.t | 2 | ||||
| -rwxr-xr-x | tests/bugs/distribute/bug-1161156.t | 2 | ||||
| -rwxr-xr-x | tests/features/glupy.t | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/bugs/distribute/bug-1122443.t b/tests/bugs/distribute/bug-1122443.t index d944a066eba..906be7072bd 100644 --- a/tests/bugs/distribute/bug-1122443.t +++ b/tests/bugs/distribute/bug-1122443.t @@ -47,7 +47,7 @@ BEFORE="$(stat -c %n:%Y $M0/subdir/* | tr '\n' ',')" # Migrate brick TEST $CLI volume add-brick $V0 $H0:$B0/${V0}1 TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}0 start -EXPECT_WITHIN 10 "completed" remove_brick_status_completed_field "$V0 $H0:$B0/${V0}0" +EXPECT_WITHIN $REBALANCE_TIMEOUT "completed" remove_brick_status_completed_field "$V0 $H0:$B0/${V0}0" TEST $CLI volume remove-brick $V0 $H0:$B0/${V0}0 commit # Get mtime after migration diff --git a/tests/bugs/distribute/bug-1161156.t b/tests/bugs/distribute/bug-1161156.t index dfaea90b414..33d1571c59d 100755 --- a/tests/bugs/distribute/bug-1161156.t +++ b/tests/bugs/distribute/bug-1161156.t @@ -40,7 +40,7 @@ TEST $CLI volume quota $V0 hard-timeout 0 TEST dd if=/dev/zero of=$N0/$mydir/newfile_1 bs=512 count=10240 # wait for write behind to complete. EXPECT_WITHIN $MARKER_UPDATE_TIMEOUT "15.0MB" usage "/" -TEST ! dd if=/dev/zero of=$N0/$mydir/newfile_2 bs=1k count=10240 +TEST ! dd if=/dev/zero of=$N0/$mydir/newfile_2 bs=1k count=10240 conv=fdatasync # Test rename within a directory. It should pass even when the # corresponding directory quota is filled. diff --git a/tests/features/glupy.t b/tests/features/glupy.t index 8b79a148d4d..2ff6430ec6a 100755 --- a/tests/features/glupy.t +++ b/tests/features/glupy.t @@ -20,7 +20,7 @@ volume vol-glupy end-volume EOF -TEST glusterfs -f $B0/glupytest.vol $M0; +TEST glusterfs -f $B0/glupytest.vol -l /var/log/glusterfs/glupy.log $M0; TEST touch $M0/filename; EXPECT "filename" ls $M0 |