diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2015-01-23 11:24:07 +0100 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-01-27 06:16:48 -0800 |
| commit | e131fccf926bc2f19fb8c9f2980f60d5fec67994 (patch) | |
| tree | e26e11967473b364a1a204b81d5172a037d430d4 | |
| parent | 0b9a6a63b50e0c4947233aee33fc86f603f77dd1 (diff) | |
tests/features/ssl-authz.t: Fix spurious failures
Fix two spurious failures in tests/features/ssl-authz.t
1) Wait for bricks to come online after starting a volume, so that
the mount is usable without "socket not connected" error
2) For a mount that must fail, we may get the situation where there
is no mount at all, which means creating a file will write to the
mount point instead of failing. To cover that case, write the
file and check it is absent from the brick.
BUG: 1129939
Change-Id: If95e1d65ab23d11123f778c20f8110a3177b0e7f
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/9483
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
| -rwxr-xr-x | tests/features/ssl-authz.t | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/features/ssl-authz.t b/tests/features/ssl-authz.t index 67d72e8f136..17ae356717c 100755 --- a/tests/features/ssl-authz.t +++ b/tests/features/ssl-authz.t @@ -50,6 +50,7 @@ TEST $CLI volume set $V0 server.ssl on TEST $CLI volume set $V0 client.ssl on #EST $CLI volume set $V0 ssl.cipher-list $(valid_ciphers) TEST $CLI volume start $V0 +EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" online_brick_count # This mount should SUCCEED because ssl-allow=* by default. This effectively # disables SSL authorization, though authentication and encryption might still @@ -62,6 +63,7 @@ EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $M0 TEST $CLI volume stop $V0 TEST $CLI volume set $V0 auth.ssl-allow Any* TEST $CLI volume start $V0 +EXPECT_WITHIN $CHILD_UP_TIMEOUT "1" online_brick_count # This mount should SUCCEED because we match the wildcard. TEST glusterfs --volfile-server=$H0 --volfile-id=$V0 $M0 @@ -90,7 +92,12 @@ TEST $CLI volume start $V0 TEST $GFS --volfile-server=$H0 --volfile-id=$V0 $M0 # Looks like /*/bin/glusterfs isn't returning error status correctly (again). -# Actually try doing something to get a real error. -TEST ! ping_file $M0/after +# We may get an unusable mount where ping will fail, or no mount at all, +# where ping will write to the mount point instead of the mounted filesystem. +# In order to avoid spurious failures, create a file by ping and check it +# is absent from the brick. +ping_file $M0/after +TEST test -f $B0/1/before +TEST ! test -f $B0/1/after cleanup; |