summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2012-05-29 13:45:49 +0200
committerMichael Adam <obnox@samba.org>2012-05-31 04:46:06 +0200
commit5ec763aeec3743aeee8e6fdfe6a518bd12d05641 (patch)
treea928effba9613e949cef9fc7c124e3577c179de2 /source3
parent886169b380dbc099d0ec97343840756e426b3a5d (diff)
downloadsamba-5ec763aeec3743aeee8e6fdfe6a518bd12d05641.tar.gz
samba-5ec763aeec3743aeee8e6fdfe6a518bd12d05641.tar.bz2
samba-5ec763aeec3743aeee8e6fdfe6a518bd12d05641.zip
s3:selftest: introduce a variable for binpath('smbtorture3') in tests.py
Diffstat (limited to 'source3')
-rwxr-xr-xsource3/selftest/tests.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 64e983c51d..77596c6d0d 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -30,6 +30,7 @@ scriptdir=os.path.join(samba3srcdir, "../script/tests")
smbclient = binpath('smbclient3')
wbinfo = binpath('wbinfo')
net = binpath('net')
+smbtorture3 = binpath('smbtorture3')
torture_options = [configuration, "--maximum-runtime=$SELFTEST_MAXTIME",
"--basedir=$SELFTEST_TMPDIR",
@@ -90,9 +91,9 @@ tests=[ "FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7",
"BAD-NBT-SESSION"]
for t in tests:
- plantestsuite("samba3.smbtorture_s3.plain(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "", "-l $LOCAL_PATH"])
- plantestsuite("samba3.smbtorture_s3.crypt(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "-e", "-l $LOCAL_PATH"])
- plantestsuite("samba3.smbtorture_s3.plain(dc).%s" % t, "dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "", "-l $LOCAL_PATH"])
+ plantestsuite("samba3.smbtorture_s3.plain(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
+ plantestsuite("samba3.smbtorture_s3.crypt(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "-e", "-l $LOCAL_PATH"])
+ plantestsuite("samba3.smbtorture_s3.plain(dc).%s" % t, "dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
env = "s3dc:local"
t = "CLEANUP3"
@@ -119,7 +120,7 @@ local_tests=[
"LOCAL-remove_duplicate_addrs2"]
for t in local_tests:
- plantestsuite("samba3.smbtorture_s3.%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "-e"])
+ plantestsuite("samba3.smbtorture_s3.%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', smbtorture3, "-e"])
tests=["--ping", "--separator",
"--own-domain",