diff options
| author | Joseph Sutton <josephsutton@catalyst.net.nz> | 2023-04-12 10:15:30 +1200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2023-04-12 13:52:32 +0000 |
| commit | 839ca0cd353df9272fdfbb18e551892135cf48fd (patch) | |
| tree | e0faee79103a135a114fce7ac6ca0e541cb44029 /source3/selftest/tests.py | |
| parent | 44d03bf47930e81679feede7a7719feb7aa77c95 (diff) | |
| download | samba-839ca0cd353df9272fdfbb18e551892135cf48fd.tar.gz | |
selftest: Only run clusteredmember tests if ctdb is built
Trying to run any of these tests without having built ctdb results in a
failure, as the environment cannot be started.
Signed-off-by: Joseph Sutton <josephsutton@catalyst.net.nz>
Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source3/selftest/tests.py')
| -rwxr-xr-x | source3/selftest/tests.py | 103 |
1 files changed, 54 insertions, 49 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index 0346867abd1..682afba7e1e 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -94,6 +94,8 @@ with_pthreadpool = ("WITH_PTHREADPOOL" in config_hash) have_smb3_unix_extensions = ("HAVE_SMB3_UNIX_EXTENSIONS" in config_hash) +have_cluster_support = "CLUSTER_SUPPORT" in config_hash + def is_module_enabled(module): if module in config_hash["STRING_SHARED_MODULES"]: return True @@ -1545,16 +1547,17 @@ plantestsuite("samba3.blackbox.smbXsrv_client_dead_rec", "fileserver:local", '$SERVER_IP', "tmp"]) -plantestsuite("samba3.blackbox.smbXsrv_client_cross_node", "clusteredmember:local", - [os.path.join(samba3srcdir, - "script/tests/test_smbXsrv_client_cross_node.sh"), - configuration, - 'ctdb0', 'ctdb1', - "tmp"]) -plantestsuite("samba3.blackbox.registry_share", "clusteredmember", - [os.path.join(samba3srcdir, - "script/tests/test_registry_share.sh"), - "$SERVER", '$DC_USERNAME', "$DC_PASSWORD"]) +if have_cluster_support: + plantestsuite("samba3.blackbox.smbXsrv_client_cross_node", "clusteredmember:local", + [os.path.join(samba3srcdir, + "script/tests/test_smbXsrv_client_cross_node.sh"), + configuration, + 'ctdb0', 'ctdb1', + "tmp"]) + plantestsuite("samba3.blackbox.registry_share", "clusteredmember", + [os.path.join(samba3srcdir, + "script/tests/test_registry_share.sh"), + "$SERVER", '$DC_USERNAME', "$DC_PASSWORD"]) env = 'fileserver' plantestsuite("samba3.blackbox.virus_scanner", "%s:local" % (env), @@ -1660,28 +1663,29 @@ plantestsuite("samba3.blackbox.smbclient-mget", "$PASSWORD", "valid_users"]) -t = "readdir-timestamp" -plantestsuite( - "samba3.smbtorture_s3.plain.%s" % t, - "clusteredmember", - [os.path.join(samba3srcdir, - "script/tests/test_smbtorture_s3.sh"), - t, - '//foo/bar', - '$DOMAIN\\\\$DC_USERNAME', - '$DC_PASSWORD', - smbtorture3, - "", - "-b $PREFIX/clusteredmember/unclists/tmp.txt -N 5 -o 10"]) +if have_cluster_support: + t = "readdir-timestamp" + plantestsuite( + "samba3.smbtorture_s3.plain.%s" % t, + "clusteredmember", + [os.path.join(samba3srcdir, + "script/tests/test_smbtorture_s3.sh"), + t, + '//foo/bar', + '$DOMAIN\\\\$DC_USERNAME', + '$DC_PASSWORD', + smbtorture3, + "", + "-b $PREFIX/clusteredmember/unclists/tmp.txt -N 5 -o 10"]) -plantestsuite( - "samba3.net_machine_account", - "clusteredmember", - [os.path.join(samba3srcdir, - "script/tests/test_net_machine_account.sh"), - "bin/net", - "$SERVERCONFFILE", - "$SERVER_IP"]) + plantestsuite( + "samba3.net_machine_account", + "clusteredmember", + [os.path.join(samba3srcdir, + "script/tests/test_net_machine_account.sh"), + "bin/net", + "$SERVERCONFFILE", + "$SERVER_IP"]) plantestsuite( "samba3.net_lookup_ldap", @@ -1724,27 +1728,28 @@ def planclusteredmembertestsuite(tname, prefix): modname=modnamearg) -CLUSTERED_TESTS = [ 'smb2.deny.deny2' ] +if have_cluster_support: + CLUSTERED_TESTS = [ 'smb2.deny.deny2' ] -for test in CLUSTERED_TESTS: - planclusteredmembertestsuite(test, "$PREFIX") + for test in CLUSTERED_TESTS: + planclusteredmembertestsuite(test, "$PREFIX") -CLUSTERED_LOCAL_TESTS = [ - "ctdbd-conn1", - "local-dbwrap-ctdb1" -] + CLUSTERED_LOCAL_TESTS = [ + "ctdbd-conn1", + "local-dbwrap-ctdb1" + ] -for t in CLUSTERED_LOCAL_TESTS: - plantestsuite( - "samba3.%s" % t, - "clusteredmember:local", - [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), - t, - '//foo/bar', - '""', - '""', - smbtorture3, - "-N 1000 -o 2000"]) + for t in CLUSTERED_LOCAL_TESTS: + plantestsuite( + "samba3.%s" % t, + "clusteredmember:local", + [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), + t, + '//foo/bar', + '""', + '""', + smbtorture3, + "-N 1000 -o 2000"]) if have_smb3_unix_extensions: planpythontestsuite("fileserver", "samba.tests.smb3unix") |