diff options
| author | Emmanuel Dreyfus <manu@netbsd.org> | 2014-10-09 09:08:57 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-10-30 01:34:11 -0700 |
| commit | d2da726fe76e61f4c499421d8d2bd588ca41b770 (patch) | |
| tree | 8a6032e7599d9a5908385bb90d01e74148ab062d /tests/bugs/bug-948729/bug-948729-mode-script.t | |
| parent | 92c4650ac809ee227c6591397a64269850f3217e (diff) | |
Regression test portability: loopback devices
Introduce functions to deal with loopback devices setup, mount
and umount.
Remove test for xfsprogs for non Linux systems, as loopback devices
can be populated with other filesystems (e.g.: FFS for NetBSD)
While there, remove mount.nfs test for non Linux systems. At least
NetBSD has it in base system as mount_nfs.
BUG: 1129939
Change-Id: I816b36e1d3e6933f92acf19d9be8eeaaa333356e
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
Reviewed-on: http://review.gluster.org/8914
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests/bugs/bug-948729/bug-948729-mode-script.t')
| -rw-r--r-- | tests/bugs/bug-948729/bug-948729-mode-script.t | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/tests/bugs/bug-948729/bug-948729-mode-script.t b/tests/bugs/bug-948729/bug-948729-mode-script.t index 5ac133a5bfe..6264e18f1bd 100644 --- a/tests/bugs/bug-948729/bug-948729-mode-script.t +++ b/tests/bugs/bug-948729/bug-948729-mode-script.t @@ -1,6 +1,7 @@ #!/bin/bash . $(dirname $0)/../../include.rc +. $(dirname $0)/../../volume.rc . $(dirname $0)/../../cluster.rc function check_peers { @@ -26,18 +27,18 @@ TEST truncate -s 16M $B1/brick1 TEST truncate -s 16M $B2/brick2 TEST truncate -s 16M $B3/brick3 -TEST LD1=`losetup --find --show $B1/brick1` -TEST mkfs.xfs $LD1 -TEST LD2=`losetup --find --show $B2/brick2` -TEST mkfs.xfs $LD2 -TEST LD3=`losetup --find --show $B3/brick3` -TEST mkfs.xfs $LD3 +TEST LD1=`SETUP_LOOP $B1/brick1` +TEST MKFS_LOOP $LD1 +TEST LD2=`SETUP_LOOP $B2/brick2` +TEST MKFS_LOOP $LD2 +TEST LD3=`SETUP_LOOP $B3/brick3` +TEST MKFS_LOOP $LD3 mkdir -p $B1/$V0 $B2/$V0 $B3/$V0 -TEST mount -t xfs $LD1 $B1/$V0 -TEST mount -t xfs $LD2 $B2/$V0 -TEST mount -t xfs $LD3 $B3/$V0 +TEST MOUNT_LOOP $LD1 $B1/$V0 +TEST MOUNT_LOOP $LD2 $B2/$V0 +TEST MOUNT_LOOP $LD3 $B3/$V0 cli1=$(echo $CLI1 | sed 's/ --wignore//') @@ -63,4 +64,14 @@ TEST $cli1 volume add-brick $V0 $H1:$B3/$V0/brick3 #FIX-ME : replace-brick does not currently work in the newly introduced #####cluster test framework +$CLI1 volume stop $V0 + +UMOUNT_LOOP $B1/$V0 +UMOUNT_LOOP $B2/$V0 +UMOUNT_LOOP $B3/$V0 + +rm -f $B1/brick1 +rm -f $B2/brick2 +rm -f $B3/brick3 + cleanup; |