diff options
| author | Ralph Boehme <slow@samba.org> | 2021-07-06 07:19:36 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2021-08-17 09:08:36 +0000 |
| commit | a2ac4ee3d71480b3fc15b6a2e6308bb467b14e6b (patch) | |
| tree | 562004017bdb37774e5fc818497ecbee806fbaff | |
| parent | 93383852f0dec537e2f9b062f113c6f5747a80b9 (diff) | |
| download | samba-a2ac4ee3d71480b3fc15b6a2e6308bb467b14e6b.tar.gz | |
selftest: pass smbclient arg to samba3.blackbox.shadow_copy_torture test
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14756
Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 745ded9afe12fda6d45638097a32b01122748649)
| -rwxr-xr-x | source3/script/tests/test_shadow_copy_torture.sh | 3 | ||||
| -rwxr-xr-x | source3/selftest/tests.py | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source3/script/tests/test_shadow_copy_torture.sh b/source3/script/tests/test_shadow_copy_torture.sh index 240a0083506..c9224892400 100755 --- a/source3/script/tests/test_shadow_copy_torture.sh +++ b/source3/script/tests/test_shadow_copy_torture.sh @@ -5,7 +5,7 @@ if [ $# -lt 7 ]; then cat <<EOF -Usage: test_shadow_copy SERVER SERVER_IP DOMAIN USERNAME PASSWORD WORKDIR SMBTORTURE +Usage: test_shadow_copy SERVER SERVER_IP DOMAIN USERNAME PASSWORD WORKDIR SMBTORTURE SMBCLIENT EOF exit 1; fi @@ -17,6 +17,7 @@ USERNAME=${4} PASSWORD=${5} WORKDIR=${6} SMBTORTURE="$VALGRIND ${7}" +SMBCLIENT="$VALGRIND ${8}" shift 7 incdir=`dirname $0`/../../../testprogs/blackbox diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index fe2fee610e5..533b58d6d9c 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -454,7 +454,7 @@ for env in ["fileserver"]: plantestsuite("samba3.blackbox.offline", env, [os.path.join(samba3srcdir, "script/tests/test_offline.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/offline', smbclient3]) plantestsuite("samba3.blackbox.shadow_copy2.NT1", env + "_smb1_done", [os.path.join(samba3srcdir, "script/tests/test_shadow_copy.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbclient3, '-m', 'NT1']) plantestsuite("samba3.blackbox.shadow_copy2.SMB3", env, [os.path.join(samba3srcdir, "script/tests/test_shadow_copy.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbclient3, '-m', 'SMB3']) - plantestsuite("samba3.blackbox.shadow_copy_torture", env, [os.path.join(samba3srcdir, "script/tests/test_shadow_copy_torture.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbtorture4]) + plantestsuite("samba3.blackbox.shadow_copy_torture", env, [os.path.join(samba3srcdir, "script/tests/test_shadow_copy_torture.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH/shadow', smbtorture4, smbclient3]) plantestsuite("samba3.blackbox.smbclient.forceuser_validusers", env, [os.path.join(samba3srcdir, "script/tests/test_forceuser_validusers.sh"), '$SERVER', '$DOMAIN', '$USERNAME', '$PASSWORD', '$LOCAL_PATH', smbclient3]) plantestsuite("samba3.blackbox.smbget", env, [os.path.join(samba3srcdir, "script/tests/test_smbget.sh"), '$SERVER', '$SERVER_IP', '$DOMAIN', 'smbget_user', '$PASSWORD', '$LOCAL_PATH/smbget', smbget]) plantestsuite("samba3.blackbox.netshareenum", env, [os.path.join(samba3srcdir, "script/tests/test_shareenum.sh"), '$SERVER', '$USERNAME', '$PASSWORD', rpcclient]) |