diff options
Diffstat (limited to 'tests/bugs/bug-921072.t')
| -rwxr-xr-x | tests/bugs/bug-921072.t | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/tests/bugs/bug-921072.t b/tests/bugs/bug-921072.t index 37f8fde52ec..8ccdea90399 100755 --- a/tests/bugs/bug-921072.t +++ b/tests/bugs/bug-921072.t @@ -12,7 +12,7 @@ TEST pidof glusterd TEST $CLI volume create $V0 $H0:$B0/$V0 TEST $CLI volume start $V0 EXPECT_WITHIN 20 1 is_nfs_export_available -TEST mount -t nfs -o vers=3,nolock,soft,intr $H0:/$V0 $N0 +TEST mount_nfs $H0:/$V0 $N0 nolock TEST umount $N0 # based on ip addresses (1-4) @@ -20,26 +20,26 @@ TEST umount $N0 TEST $CLI volume set $V0 nfs.rpc-auth-allow 127.0.0.1 EXPECT_WITHIN 20 1 is_nfs_export_available -TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 +TEST mount_nfs localhost:/$V0 $N0 nolock TEST umount $N0 # case 2: allow only non-localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-allow 192.168.1.1 EXPECT_WITHIN 20 1 is_nfs_export_available #11 -TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 +TEST ! mount_nfs localhost:/$V0 $N0 nolock TEST $CLI volume reset --mode=script $V0 # case 3: reject only localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-reject 127.0.0.1 EXPECT_WITHIN 20 1 is_nfs_export_available -TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 +TEST ! mount_nfs localhost:/$V0 $N0 nolock # case 4: reject only non-localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-reject 192.168.1.1 EXPECT_WITHIN 20 1 is_nfs_export_available -TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 +TEST mount_nfs localhost:/$V0 $N0 nolock TEST umount $N0 @@ -50,21 +50,21 @@ TEST $CLI volume reset --mode=script $V0 TEST $CLI volume set $V0 nfs.addr-namelookup on EXPECT_WITHIN 20 1 is_nfs_export_available #20 -TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 +TEST mount_nfs localhost:/$V0 $N0 nolock TEST umount $N0 # case 5: allow only localhost TEST $CLI volume set $V0 nfs.rpc-auth-allow localhost EXPECT_WITHIN 20 1 is_nfs_export_available -TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 +TEST mount_nfs localhost:/$V0 $N0 nolock TEST umount $N0 # case 6: allow only somehost TEST $CLI volume set $V0 nfs.rpc-auth-allow somehost EXPECT_WITHIN 20 1 is_nfs_export_available -TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 +TEST ! mount_nfs localhost:/$V0 $N0 nolock # case 7: reject only localhost TEST $CLI volume reset --mode=script $V0 @@ -72,13 +72,13 @@ TEST $CLI volume set $V0 nfs.addr-namelookup on TEST $CLI volume set $V0 nfs.rpc-auth-reject localhost EXPECT_WITHIN 20 1 is_nfs_export_available #30 -TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 +TEST ! mount_nfs localhost:/$V0 $N0 nolock # case 8: reject only somehost TEST $CLI volume set $V0 nfs.rpc-auth-reject somehost EXPECT_WITHIN 20 1 is_nfs_export_available -TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 +TEST mount_nfs localhost:/$V0 $N0 nolock TEST umount $N0 # based on ip addresses: repeat of cases 1-4 @@ -88,7 +88,7 @@ TEST $CLI volume set $V0 nfs.addr-namelookup on TEST $CLI volume set $V0 nfs.rpc-auth-allow 127.0.0.1 EXPECT_WITHIN 20 1 is_nfs_export_available -TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 +TEST mount_nfs localhost:/$V0 $N0 nolock TEST mkdir -p $N0/subdir TEST umount $N0 @@ -96,7 +96,7 @@ TEST umount $N0 TEST $CLI volume set $V0 nfs.rpc-auth-allow 192.168.1.1 EXPECT_WITHIN 20 1 is_nfs_export_available #41 -TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 +TEST ! mount_nfs localhost:/$V0 $N0 nolock # case 11: reject only localhost ip TEST $CLI volume reset --mode=script $V0 @@ -104,17 +104,17 @@ TEST $CLI volume set $V0 nfs.addr-namelookup on TEST $CLI volume set $V0 nfs.rpc-auth-reject 127.0.0.1 EXPECT_WITHIN 20 1 is_nfs_export_available -TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 -TEST ! mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0/subdir $N0 +TEST ! mount_nfs localhost:/$V0 $N0 nolock +TEST ! mount_nfs localhost:/$V0/subdir $N0 nolock # case 12: reject only non-localhost ip TEST $CLI volume set $V0 nfs.rpc-auth-reject 192.168.1.1 EXPECT_WITHIN 20 1 is_nfs_export_available -TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0 $N0 +TEST mount_nfs localhost:/$V0 $N0 nolock TEST umount $N0 -TEST mount -t nfs -o vers=3,nolock,soft,intr localhost:/$V0/subdir $N0 +TEST mount_nfs localhost:/$V0/subdir $N0 nolock TEST umount $N0 TEST $CLI volume stop --mode=script $V0 |