diff options
Diffstat (limited to 'tests/bugs/bug-921072.t')
| -rwxr-xr-x | tests/bugs/bug-921072.t | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tests/bugs/bug-921072.t b/tests/bugs/bug-921072.t index ea5a91c2c24..8f7a5d05362 100755 --- a/tests/bugs/bug-921072.t +++ b/tests/bugs/bug-921072.t @@ -2,6 +2,7 @@ . $(dirname $0)/../include.rc . $(dirname $0)/../nfs.rc +. $(dirname $0)/../volume.rc cleanup; @@ -13,7 +14,7 @@ TEST $CLI volume create $V0 $H0:$B0/$V0 TEST $CLI volume start $V0 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs $H0:/$V0 $N0 nolock -TEST umount $N0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 # based on ip addresses (1-4) # case 1: allow only localhost ip @@ -21,7 +22,7 @@ TEST $CLI volume set $V0 nfs.rpc-auth-allow 127.0.0.1 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs localhost:/$V0 $N0 nolock -TEST umount $N0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 # case 2: allow only non-localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-allow 192.168.1.1 @@ -40,7 +41,7 @@ TEST $CLI volume set $V0 nfs.rpc-auth-reject 192.168.1.1 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs localhost:/$V0 $N0 nolock -TEST umount $N0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 @@ -51,14 +52,14 @@ TEST $CLI volume set $V0 nfs.addr-namelookup on EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available #20 TEST mount_nfs localhost:/$V0 $N0 nolock -TEST umount $N0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 # case 5: allow only localhost TEST $CLI volume set $V0 nfs.rpc-auth-allow localhost EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs localhost:/$V0 $N0 nolock -TEST umount $N0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 # case 6: allow only somehost TEST $CLI volume set $V0 nfs.rpc-auth-allow somehost @@ -79,7 +80,7 @@ TEST $CLI volume set $V0 nfs.rpc-auth-reject somehost EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs localhost:/$V0 $N0 nolock -TEST umount $N0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 # based on ip addresses: repeat of cases 1-4 # case 9: allow only localhost ip @@ -90,7 +91,7 @@ EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs localhost:/$V0 $N0 nolock TEST mkdir -p $N0/subdir -TEST umount $N0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 # case 10: allow a non-localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-allow 192.168.1.1 @@ -112,10 +113,10 @@ TEST $CLI volume set $V0 nfs.rpc-auth-reject 192.168.1.1 EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available TEST mount_nfs localhost:/$V0 $N0 nolock -TEST umount $N0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 TEST mount_nfs localhost:/$V0/subdir $N0 nolock -TEST umount $N0 +EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 TEST $CLI volume stop --mode=script $V0 #52 |