From 64954eb3c58f4ef077e54e8a3726fd2d27419b12 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Fri, 26 Dec 2014 12:57:48 +0100 Subject: 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 Reported-by: Atin Mukherjee URL: http://www.gluster.org/pipermail/gluster-devel/2014-December/043414.html Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/9353 Reviewed-by: Kaleb KEITHLEY Reviewed-by: Emmanuel Dreyfus Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- tests/bugs/bug-904065.t | 91 ------------------------------------------------- 1 file changed, 91 deletions(-) delete mode 100755 tests/bugs/bug-904065.t (limited to 'tests/bugs/bug-904065.t') diff --git a/tests/bugs/bug-904065.t b/tests/bugs/bug-904065.t deleted file mode 100755 index 0b39adb5c68..00000000000 --- a/tests/bugs/bug-904065.t +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash -# -# This test does not use 'showmount' from the nfs-utils package, it would -# require setting up a portmapper (either rpcbind or portmap, depending on the -# Linux distribution used for testing). The persistancy of the rmtab should not -# affect the current showmount outputs, so existing regression tests should be -# sufficient. -# - -# count the lines of a file, return 0 if the file does not exist -function count_lines() -{ - if [ -e "$1" ] - then - wc -l < $1 - else - echo 0 - fi -} - - -. $(dirname $0)/../include.rc -. $(dirname $0)/../nfs.rc -. $(dirname $0)/../volume.rc - -cleanup - -TEST glusterd -TEST pidof glusterd - -TEST $CLI volume create $V0 $H0:$B0/brick1 -EXPECT 'Created' volinfo_field $V0 'Status' - -TEST $CLI volume start $V0; -EXPECT 'Started' volinfo_field $V0 'Status' - -# glusterfs/nfs needs some time to start up in the background -EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available - -# before mounting the rmtab should be empty -EXPECT '0' count_lines $GLUSTERD_WORKDIR/nfs/rmtab - -TEST mount_nfs $H0:/$V0 $N0 nolock -# the output would looks similar to: -# -# hostname-0=172.31.122.104 -# mountpoint-0=/ufo -# -EXPECT '2' count_lines $GLUSTERD_WORKDIR/nfs/rmtab - -# duplicate mounts should not be recorded (client could have crashed) -TEST mount_nfs $H0:/$V0 $N1 nolock -EXPECT '2' count_lines $GLUSTERD_WORKDIR/nfs/rmtab - -# removing a mount should (even if there are two) should remove the entry -EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N1 -EXPECT '0' count_lines $GLUSTERD_WORKDIR/nfs/rmtab - -# unmounting the other mount should work flawlessly -EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 -EXPECT '0' count_lines $GLUSTERD_WORKDIR/nfs/rmtab - -TEST glusterfs --entry-timeout=0 --attribute-timeout=0 --volfile-server=$H0 --volfile-id=$V0 $M0 - -# we'll create a fake rmtab here, similar to how an other storage server would do -# using an invalid IP address to prevent (unlikely) collisions on the test-machine -cat << EOF > $M0/rmtab -hostname-0=127.0.0.256 -mountpoint-0=/ufo -EOF -EXPECT '2' count_lines $M0/rmtab - -# reconfigure merges the rmtab with the one on the volume -TEST gluster volume set $V0 nfs.mount-rmtab $M0/rmtab - -# glusterfs/nfs needs some time to restart -EXPECT_WITHIN $NFS_EXPORT_TIMEOUT 1 is_nfs_export_available - -# a new mount should be added to the rmtab, not overwrite exiting ones -TEST mount_nfs $H0:/$V0 $N0 nolock -EXPECT '4' count_lines $M0/rmtab - -EXPECT_WITHIN $UMOUNT_TIMEOUT "Y" force_umount $N0 -EXPECT '2' count_lines $M0/rmtab - -# TODO: nfs/reconfigure() is never called and is therefor disabled. When the -# NFS-server supports reloading and does not get restarted anymore, we should -# add a test that includes the merging of entries in the old rmtab with the new -# rmtab. - -cleanup -- cgit