diff options
| author | Niels de Vos <ndevos@redhat.com> | 2014-12-26 12:57:48 +0100 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2015-01-06 03:24:24 -0800 |
| commit | 64954eb3c58f4ef077e54e8a3726fd2d27419b12 (patch) | |
| tree | 52cd5a39bbfda7442a5f0955ac2800b74a45b58a /tests/bugs/bug-948729 | |
| parent | c4ab37c02e9edc23d0637e23d6f2b42d0827dad2 (diff) | |
tests: move all test-cases into component subdirectories
There are around 300 regression tests, 250 being in tests/bugs. Running
partial set of tests/bugs is not easy because this is a flat directory
with almost all tests inside.
It would be valuable to make partial test/bugs easier, and allow the use
of mulitple build hosts for a single commit, each running a subset of
the tests for a quicker result.
Additional changes made:
- correct the include path for *.rc shell libraries and *.py utils
- make the testcases pass checkpatch
- arequal-checksum in afr/self-heal.t was never executed, now it is
- include.rc now complains loudly if it fails to find env.rc
Change-Id: I26ffd067e9853d3be1fd63b2f37d8aa0fd1b4fea
BUG: 1178685
Reported-by: Emmanuel Dreyfus <manu@netbsd.org>
Reported-by: Atin Mukherjee <amukherj@redhat.com>
URL: http://www.gluster.org/pipermail/gluster-devel/2014-December/043414.html
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: http://review.gluster.org/9353
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Emmanuel Dreyfus <manu@netbsd.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
Diffstat (limited to 'tests/bugs/bug-948729')
| -rw-r--r-- | tests/bugs/bug-948729/bug-948729-force.t | 103 | ||||
| -rw-r--r-- | tests/bugs/bug-948729/bug-948729-mode-script.t | 77 | ||||
| -rw-r--r-- | tests/bugs/bug-948729/bug-948729.t | 80 |
3 files changed, 0 insertions, 260 deletions
diff --git a/tests/bugs/bug-948729/bug-948729-force.t b/tests/bugs/bug-948729/bug-948729-force.t deleted file mode 100644 index b4106a58736..00000000000 --- a/tests/bugs/bug-948729/bug-948729-force.t +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash - -. $(dirname $0)/../../include.rc -. $(dirname $0)/../../volume.rc -. $(dirname $0)/../../cluster.rc - -function check_peers { - $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l -} - -cleanup; -uuid1=`uuidgen`; -uuid2=`uuidgen`; -uuid3=`uuidgen`; - -V1=patchy1 -V2=patchy2 - -TEST launch_cluster 2; - -TEST $CLI_1 peer probe $H2; - -EXPECT_WITHIN $PROBE_TIMEOUT 1 check_peers; - -B3=/d/backends/3 -B4=/d/backends/4 -B5=/d/backends/5 -B6=/d/backends/6 - -mkdir -p $B3 $B4 $B5 $B6 - -TEST truncate -s 16M $B1/brick1 -TEST truncate -s 16M $B2/brick2 -TEST truncate -s 16M $B3/brick3 -TEST truncate -s 16M $B4/brick4 -TEST truncate -s 16M $B5/brick5 -TEST truncate -s 16M $B6/brick6 - -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 -TEST LD4=`SETUP_LOOP $B4/brick4` -TEST MKFS_LOOP $LD4 -TEST LD5=`SETUP_LOOP $B5/brick5` -TEST MKFS_LOOP $LD5 -TEST LD6=`SETUP_LOOP $B6/brick6` -TEST MKFS_LOOP $LD6 - -mkdir -p $B1/$V0 $B2/$V0 $B3/$V0 $B4/$V0 $B5/$V0 $B6/$V0 - -TEST MOUNT_LOOP $LD1 $B1/$V0 -TEST MOUNT_LOOP $LD2 $B2/$V0 -TEST MOUNT_LOOP $LD3 $B3/$V0 -TEST MOUNT_LOOP $LD4 $B4/$V0 -TEST MOUNT_LOOP $LD5 $B5/$V0 -TEST MOUNT_LOOP $LD6 $B6/$V0 - -#Case 0: Parent directory of the brick is absent -TEST ! $CLI1 volume create $V0 $H1:$B1/$V0/nonexistent/b1 $H2:$B2/$V0/nonexistent/b2 force - -#Case 1: File system root is being used as brick directory -TEST $CLI1 volume create $V0 $H1:$B5/$V0 $H2:$B6/$V0 force - -#Case 2: Brick directory contains only one component -TEST $CLI1 volume create $V1 $H1:/$uuid1 $H2:/$uuid2 force - -#Case 3: Sub-directories of the backend FS being used as brick directory -TEST $CLI1 volume create $V2 $H1:$B1/$V0/brick1 $H2:$B2/$V0/brick2 force - -#add-brick tests -TEST ! $CLI1 volume add-brick $V0 $H1:$B3/$V0/nonexistent/brick3 force -TEST $CLI1 volume add-brick $V0 $H1:$B3/$V0 force -TEST $CLI1 volume add-brick $V1 $H1:/$uuid3 force -TEST $CLI1 volume add-brick $V2 $H1:$B4/$V0/brick3 force - -#####replace-brick tests -#FIX-ME: replace-brick does not work with the newly introduced cluster test -#####framework - -rmdir /$uuid1 /$uuid2 /$uuid3; - -$CLI volume stop $V0 -$CLI volume stop $V1 -$CLI volume stop $V2 - -UMOUNT_LOOP $B1/$V0 -UMOUNT_LOOP $B2/$V0 -UMOUNT_LOOP $B3/$V0 -UMOUNT_LOOP $B4/$V0 -UMOUNT_LOOP $B5/$V0 -UMOUNT_LOOP $B6/$V0 - -rm -f $B1/brick1 -rm -f $B2/brick2 -rm -f $B3/brick3 -rm -f $B4/brick4 -rm -f $B5/brick5 -rm -f $B6/brick6 - -cleanup; diff --git a/tests/bugs/bug-948729/bug-948729-mode-script.t b/tests/bugs/bug-948729/bug-948729-mode-script.t deleted file mode 100644 index 6264e18f1bd..00000000000 --- a/tests/bugs/bug-948729/bug-948729-mode-script.t +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/bash - -. $(dirname $0)/../../include.rc -. $(dirname $0)/../../volume.rc -. $(dirname $0)/../../cluster.rc - -function check_peers { - $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l -} - -cleanup; - -uuid1=`uuidgen`; -uuid2=`uuidgen`; -uuid3=`uuidgen`; - -TEST launch_cluster 2; - -TEST $CLI_1 peer probe $H2; - -EXPECT_WITHIN $PROBE_TIMEOUT 1 check_peers; - -B3=/d/backends/3 -mkdir -p $B3 - -TEST truncate -s 16M $B1/brick1 -TEST truncate -s 16M $B2/brick2 -TEST truncate -s 16M $B3/brick3 - -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_LOOP $LD1 $B1/$V0 -TEST MOUNT_LOOP $LD2 $B2/$V0 -TEST MOUNT_LOOP $LD3 $B3/$V0 - -cli1=$(echo $CLI1 | sed 's/ --wignore//') - -#Case 0: Parent directory of the brick is absent -TEST ! $cli1 volume create $V0 $H1:$B1/$V0/nonexistent/b1 $H2:$B2/$V0/nonexistent/b2 - -#Case 1: File system root being used as brick directory -TEST ! $cli1 volume create $V0 $H1:$B1/$V0 $H2:$B2/$V0 - -#Case 2: Brick directory contains only one component -TEST ! $cli1 volume create $V0 $H1:/$uuid1 $H2:/$uuid2 - -#Case 3: Sub-directories of the backend FS being used as brick directory -TEST $cli1 volume create $V0 $H1:$B1/$V0/brick1 $H2:$B2/$V0/brick2 - -#add-brick tests -TEST ! $cli1 volume add-brick $V0 $H1:$B3/$V0/nonexistent/brick3 -TEST ! $cli1 volume add-brick $V0 $H1:$B3/$V0 -TEST ! $cli1 volume add-brick $V0 $H1:/$uuid3 -TEST $cli1 volume add-brick $V0 $H1:$B3/$V0/brick3 - -#####replace-brick tests -#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; diff --git a/tests/bugs/bug-948729/bug-948729.t b/tests/bugs/bug-948729/bug-948729.t deleted file mode 100644 index 46cdb3d8e8c..00000000000 --- a/tests/bugs/bug-948729/bug-948729.t +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/bash - -. $(dirname $0)/../../include.rc -. $(dirname $0)/../../volume.rc -. $(dirname $0)/../../cluster.rc - -function check_peers { - $CLI_1 peer status | grep 'Peer in Cluster (Connected)' | wc -l -} - -cleanup; - -uuid1=`uuidgen`; -uuid2=`uuidgen`; -uuid3=`uuidgen`; - -TEST launch_cluster 2; - -TEST $CLI_1 peer probe $H2; - -EXPECT_WITHIN $PROBE_TIMEOUT 1 check_peers; - -B3=/d/backends/3 - -mkdir -p $B3 - -TEST truncate -s 16M $B1/brick1 -TEST truncate -s 16M $B2/brick2 -TEST truncate -s 16M $B3/brick3 - -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_LOOP $LD1 $B1/$V0 -TEST MOUNT_LOOP $LD2 $B2/$V0 -TEST MOUNT_LOOP $LD3 $B3/$V0 - -#Tests without options 'mode=script' and 'wignore' -cli1=$(echo $CLI1 | sed 's/ --mode=script//') -cli1=$(echo $cli1 | sed 's/ --wignore//') -#Case 0: Parent directory of the brick is absent -TEST ! $cli1 volume create $V0 $H1:$B1/$V0/nonexistent/b1 $H2:$B2/$V0/nonexistent/b2 - -#Case 1: File system root being used as brick directory -TEST ! $cli1 volume create $V0 $H1:$B1/$V0 $H2:$B2/$V0 - -#Case 2: Brick directory contains only one component -TEST ! $cli1 volume create $V0 $H1:/$uuid1 $H2:/$uuid2 - -#Case 3: Sub-directories of the backend FS being used as brick directory -TEST $cli1 volume create $V0 $H1:$B1/$V0/brick1 $H2:$B2/$V0/brick2 - -#add-brick tests -TEST ! $cli1 volume add-brick $V0 $H1:$B3/$V0/nonexistent/b3 -TEST ! $cli1 volume add-brick $V0 $H1:$B3/$V0 -TEST ! $cli1 volume add-brick $V0 $H1:/$uuid3 -TEST $cli1 volume add-brick $V0 $H1:$B3/$V0/brick3 - -#####replace-brick tests -#FIX-ME: Replace-brick does not work currently 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; |
