[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  a7b8d02 source3.selftest: Move last variables to selftesthelpers.
       via  6698098 source3.selftest: Move more variables to be in common.
      from  1326992 selftesthelpers: Fix detection of tap2subunit.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a7b8d0260a55959c72614251db880fed04a48316
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Oct 27 05:31:06 2012 -0800

    source3.selftest: Move last variables to selftesthelpers.
    
    Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date(master): Sat Oct 27 19:08:42 CEST 2012 on sn-devel-104

commit 66980989e5b28490cd7b04b576cf39d26f183b90
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Oct 27 05:23:57 2012 -0800

    source3.selftest: Move more variables to be in common.

-----------------------------------------------------------------------

Summary of changes:
 selftest/selftesthelpers.py |   15 +++++++++++++++
 source3/selftest/tests.py   |   21 +++++----------------
 2 files changed, 20 insertions(+), 16 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index 8d36356..cdbe975 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -29,6 +29,9 @@ def srcdir():
 def source4dir():
     return os.path.normpath(os.path.join(srcdir(), "source4"))
 
+def source3dir():
+    return os.path.normpath(os.path.join(srcdir(), "source3"))
+
 def bindir():
     return os.path.normpath(os.getenv("BINDIR", "./bin"))
 
@@ -192,6 +195,7 @@ def get_env_torture_options():
 
 
 samba4srcdir = source4dir()
+samba3srcdir = source3dir()
 bbdir = os.path.join(srcdir(), "testprogs/blackbox")
 configuration = "--configfile=$SMB_CONF_PATH"
 
@@ -233,3 +237,14 @@ def plansmbtorture4testsuite(name, env, options, target, modname=None):
 
 def smbtorture4_testsuites(prefix):
     return filter(lambda x: x.startswith(prefix), smbtorture4_testsuite_list)
+
+
+smbclient3 = binpath('smbclient3')
+smbtorture3 = binpath('smbtorture3')
+ntlm_auth3 = binpath('ntlm_auth3')
+net = binpath('net')
+scriptdir = os.path.join(srcdir(), "script/tests")
+
+wbinfo = binpath('wbinfo')
+dbwrap_tool = binpath('dbwrap_tool')
+vfstest = binpath('vfstest')
diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 777a882..9b0527c 100755
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -22,17 +22,6 @@ import os, sys
 sys.path.insert(0, os.path.normpath(os.path.join(os.path.dirname(__file__), "../../selftest")))
 import selftesthelpers
 from selftesthelpers import *
-samba3srcdir = srcdir() + "/source3"
-scriptdir = os.path.join(samba3srcdir, "../script/tests")
-
-smbclient3 = binpath('smbclient3')
-wbinfo = binpath('wbinfo')
-net = binpath('net')
-smbtorture3 = binpath('smbtorture3')
-ntlm_auth3 = binpath('ntlm_auth3')
-dbwrap_tool = binpath('dbwrap_tool')
-vfstest = binpath('vfstest')
-
 smbtorture4_options.extend([
    '--option="torture:winbindd_netbios_name=$SERVER"',
    '--option="torture:winbindd_netbios_domain=$DOMAIN"',
@@ -62,7 +51,7 @@ plantestsuite("samba3.local_s3", "s3dc:local", [os.path.join(samba3srcdir, "scri
 
 plantestsuite("samba3.blackbox.registry.upgrade", "s3dc:local", [os.path.join(samba3srcdir, "script/tests/test_registry_upgrade.sh"), net, dbwrap_tool])
 
-tests=[ "FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7", "LOCK9",
+tests = ["FDPASS", "LOCK1", "LOCK2", "LOCK3", "LOCK4", "LOCK5", "LOCK6", "LOCK7", "LOCK9",
         "UNLINK", "BROWSE", "ATTR", "TRANS2", "TORTURE",
         "OPLOCK1", "OPLOCK2", "OPLOCK4", "STREAMERROR",
         "DIR", "DIR1", "DIR-CREATETIME", "TCON", "TCONDEV", "RW1", "RW2", "RW3", "RW-SIGNING",
@@ -89,7 +78,7 @@ tests = ["RW1", "RW2", "RW3"]
 for t in tests:
     plantestsuite("samba3.smbtorture_s3.vfs_aio_fork(simpleserver).%s" % t, "simpleserver", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/vfs_aio_fork', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
 
-posix_tests=[ "POSIX", "POSIX-APPEND"]
+posix_tests = ["POSIX", "POSIX-APPEND"]
 
 for t in posix_tests:
     plantestsuite("samba3.smbtorture_s3.plain(s3dc).%s" % t, "s3dc", [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/posix_share', '$USERNAME', '$PASSWORD', smbtorture3, "", "-l $LOCAL_PATH"])
@@ -100,7 +89,7 @@ env = "s3dc:local"
 t = "CLEANUP3"
 plantestsuite("samba3.smbtorture_s3.plain(%s).%s" % (env, t), env, [os.path.join(samba3srcdir, "script/tests/test_smbtorture_s3.sh"), t, '//$SERVER_IP/tmp', '$USERNAME', '$PASSWORD', binpath('smbtorture3'), "", "-l $LOCAL_PATH"])
 
-local_tests=[
+local_tests = [
     "LOCAL-SUBSTITUTE",
     "LOCAL-GENCACHE",
     "LOCAL-TALLOC-DICT",
@@ -123,7 +112,7 @@ local_tests=[
 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', smbtorture3, "-e"])
 
-tests=["--ping", "--separator",
+tests = ["--ping", "--separator",
        "--own-domain",
        "--all-domains",
        "--trusted-domains",
@@ -218,7 +207,7 @@ plantestsuite("samba3.blackbox.net.local.registry", "s3dc:local",
                scriptdir, "$SMB_CONF_PATH", net, configuration])
 plantestsuite("samba3.blackbox.net.registry.check", "s3dc:local",
               [os.path.join(samba3srcdir, "script/tests/test_net_registry_check.sh"),
-               scriptdir, "$SMB_CONF_PATH", net, configuration,dbwrap_tool])
+               scriptdir, "$SMB_CONF_PATH", net, configuration, dbwrap_tool])
 plantestsuite("samba3.blackbox.net.rpc.registry", "s3dc",
               [os.path.join(samba3srcdir, "script/tests/test_net_registry.sh"),
                scriptdir, "$SMB_CONF_PATH", net, configuration, 'rpc'])


-- 
Samba Shared Repository