diff options
author | Amar Tumballi <amarts@redhat.com> | 2019-01-11 11:57:07 +0530 |
---|---|---|
committer | Niels de Vos <ndevos@redhat.com> | 2019-01-24 15:18:00 +0000 |
commit | 99b3ab0cf3d3389a2ff89c29cfff906cd36693a3 (patch) | |
tree | dd377ef38a151d472846eec228f583a66888cdb8 /tests/basic | |
parent | 06061aaa447f03e2522483d02525619ebc9854db (diff) |
tests: run nfs tests only if --enable-gnfs is provided
Fixes: bz#1665358
Change-Id: Idbf88ec3ac683733b32c313377eeb72f2819bf0d
Signed-off-by: Amar Tumballi <amarts@redhat.com>
Diffstat (limited to 'tests/basic')
-rw-r--r-- | tests/basic/afr/arbiter-mount.t | 3 | ||||
-rw-r--r-- | tests/basic/afr/tarissue.t | 2 | ||||
-rw-r--r-- | tests/basic/all_squash.t | 2 | ||||
-rwxr-xr-x | tests/basic/ec/nfs.t | 2 | ||||
-rwxr-xr-x | tests/basic/mount-nfs-auth.t | 2 | ||||
-rwxr-xr-x | tests/basic/mount.t | 3 | ||||
-rw-r--r-- | tests/basic/namespace.t | 2 | ||||
-rw-r--r-- | tests/basic/nufa.t | 2 | ||||
-rwxr-xr-x | tests/basic/quota-anon-fd-nfs.t | 2 | ||||
-rwxr-xr-x | tests/basic/quota-nfs.t | 2 | ||||
-rwxr-xr-x | tests/basic/quota.t | 2 | ||||
-rw-r--r-- | tests/basic/stats-dump.t | 2 | ||||
-rw-r--r-- | tests/basic/uss.t | 2 | ||||
-rw-r--r-- | tests/basic/volume-status.t | 2 |
14 files changed, 29 insertions, 1 deletions
diff --git a/tests/basic/afr/arbiter-mount.t b/tests/basic/afr/arbiter-mount.t index da99096f81f..404d334d2f9 100644 --- a/tests/basic/afr/arbiter-mount.t +++ b/tests/basic/afr/arbiter-mount.t @@ -4,6 +4,9 @@ . $(dirname $0)/../../volume.rc . $(dirname $0)/../../afr.rc . $(dirname $0)/../../nfs.rc + +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + cleanup; #Check that mounting fails when only arbiter brick is up. diff --git a/tests/basic/afr/tarissue.t b/tests/basic/afr/tarissue.t index a35d468eb0c..83f7463130c 100644 --- a/tests/basic/afr/tarissue.t +++ b/tests/basic/afr/tarissue.t @@ -4,6 +4,8 @@ . $(dirname $0)/../../volume.rc . $(dirname $0)/../../nfs.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + TESTS_EXPECTED_IN_LOOP=10 cleanup; diff --git a/tests/basic/all_squash.t b/tests/basic/all_squash.t index 44631988165..29766c50af7 100644 --- a/tests/basic/all_squash.t +++ b/tests/basic/all_squash.t @@ -3,6 +3,8 @@ . $(dirname $0)/../volume.rc . $(dirname $0)/../nfs.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + cleanup; TEST glusterd diff --git a/tests/basic/ec/nfs.t b/tests/basic/ec/nfs.t index f0bdff93d5f..3f51a640ef7 100755 --- a/tests/basic/ec/nfs.t +++ b/tests/basic/ec/nfs.t @@ -3,6 +3,8 @@ . $(dirname $0)/../../include.rc . $(dirname $0)/../../nfs.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + cleanup TEST glusterd diff --git a/tests/basic/mount-nfs-auth.t b/tests/basic/mount-nfs-auth.t index 0d4e01abb32..3d4a9cff00b 100755 --- a/tests/basic/mount-nfs-auth.t +++ b/tests/basic/mount-nfs-auth.t @@ -3,6 +3,8 @@ . $(dirname $0)/../include.rc . $(dirname $0)/../nfs.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + # Our mount timeout must be as long as the time for a regular configuration # change to be acted upon *plus* AUTH_REFRESH_TIMEOUT, not one replacing the # other. Otherwise this process races vs. the one making the change we're diff --git a/tests/basic/mount.t b/tests/basic/mount.t index 26feeb9be0e..f4c2df31135 100755 --- a/tests/basic/mount.t +++ b/tests/basic/mount.t @@ -3,8 +3,9 @@ . $(dirname $0)/../include.rc . $(dirname $0)/../nfs.rc -cleanup; +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST +cleanup; ## Start and create a volume TEST glusterd diff --git a/tests/basic/namespace.t b/tests/basic/namespace.t index 25a6b98b440..d1bbe7eea29 100644 --- a/tests/basic/namespace.t +++ b/tests/basic/namespace.t @@ -4,6 +4,8 @@ . $(dirname $0)/../volume.rc . $(dirname $0)/../nfs.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + # These hashes are a result of calling SuperFastHash # on the corresponding folder names. NAMESPACE_HASH=28153613 diff --git a/tests/basic/nufa.t b/tests/basic/nufa.t index 6221fb16a8f..cb09fc5bbbf 100644 --- a/tests/basic/nufa.t +++ b/tests/basic/nufa.t @@ -4,6 +4,8 @@ . $(dirname $0)/../volume.rc . $(dirname $0)/../nfs.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + cleanup; TEST glusterd diff --git a/tests/basic/quota-anon-fd-nfs.t b/tests/basic/quota-anon-fd-nfs.t index 11fbe49c7ff..9e6675af6ec 100755 --- a/tests/basic/quota-anon-fd-nfs.t +++ b/tests/basic/quota-anon-fd-nfs.t @@ -5,6 +5,8 @@ . $(dirname $0)/../nfs.rc . $(dirname $0)/../fileio.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + cleanup; QDD=$(dirname $0)/quota diff --git a/tests/basic/quota-nfs.t b/tests/basic/quota-nfs.t index 663a8da90ad..de94a950a7f 100755 --- a/tests/basic/quota-nfs.t +++ b/tests/basic/quota-nfs.t @@ -4,6 +4,8 @@ . $(dirname $0)/../volume.rc . $(dirname $0)/../nfs.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + cleanup; QDD=$(dirname $0)/quota # compile the test write program and run it diff --git a/tests/basic/quota.t b/tests/basic/quota.t index 7f8b21de6f8..46d1bafff84 100755 --- a/tests/basic/quota.t +++ b/tests/basic/quota.t @@ -6,6 +6,8 @@ . $(dirname $0)/../dht.rc . $(dirname $0)/../nfs.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + cleanup; QDD=$(dirname $0)/quota diff --git a/tests/basic/stats-dump.t b/tests/basic/stats-dump.t index 054df2e636f..ed73fd1d14a 100644 --- a/tests/basic/stats-dump.t +++ b/tests/basic/stats-dump.t @@ -4,6 +4,8 @@ . $(dirname $0)/../volume.rc . $(dirname $0)/../nfs.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + cleanup; TEST glusterd diff --git a/tests/basic/uss.t b/tests/basic/uss.t index 40e556e372e..47deef66e24 100644 --- a/tests/basic/uss.t +++ b/tests/basic/uss.t @@ -6,6 +6,8 @@ . $(dirname $0)/../fileio.rc . $(dirname $0)/../nfs.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + function check_readonly() { $@ 2>&1 | grep -q 'Read-only file system' diff --git a/tests/basic/volume-status.t b/tests/basic/volume-status.t index d0d0b90250f..a79e202d4ab 100644 --- a/tests/basic/volume-status.t +++ b/tests/basic/volume-status.t @@ -4,6 +4,8 @@ . $(dirname $0)/../volume.rc . $(dirname $0)/../nfs.rc +#G_TESTDEF_TEST_STATUS_CENTOS6=NFS_TEST + cleanup; function gluster_client_list_status () { |