[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Mon Mar 5 18:27:03 MST 2012


The branch, master has been updated
       via  f033c22 policy/python: Move python binding tests to standard location.
       via  aaffd99 selftest/tests.py: Fix name of selftest.py for benefit of --load-list.
       via  b9ac1f4 selftest.py: Only run teardown_all when actually relevant.
      from  074ee6f s3-rpc_server: Remove remaining code for embedded endpoint mapper

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


- Log -----------------------------------------------------------------
commit f033c221f8f459759aee259be8f52a79fd7e8f3f
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Mar 6 00:46:55 2012 +0100

    policy/python: Move python binding tests to standard location.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Tue Mar  6 02:26:29 CET 2012 on sn-devel-104

commit aaffd996abd9404bb942570f49ca01598ebe0fc3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Mar 6 00:39:11 2012 +0100

    selftest/tests.py: Fix name of selftest.py for benefit of --load-list.

commit b9ac1f45a14b9783602fe4508b1f450dd2676bb6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Mar 6 00:38:54 2012 +0100

    selftest.py: Only run teardown_all when actually relevant.

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

Summary of changes:
 selftest/selftest.py                               |    4 +---
 .../python/samba/tests/policy.py}                  |    0
 source4/selftest/tests.py                          |    4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)
 rename source4/{lib/policy/tests/python/bindings.py => scripting/python/samba/tests/policy.py} (100%)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.py b/selftest/selftest.py
index 26c409a..1b20441 100755
--- a/selftest/selftest.py
+++ b/selftest/selftest.py
@@ -538,12 +538,10 @@ else:
 
         if opts.resetup_environment:
             env_manager.teardown_env(envname)
+    env_manager.teardown_all()
 
 sys.stdout.write("\n")
 
-if not opts.list:
-    env_manager.teardown_all()
-
 # if there were any valgrind failures, show them
 for fn in os.listdir(prefix):
     if fn.startswith("valgrind.log"):
diff --git a/source4/lib/policy/tests/python/bindings.py b/source4/scripting/python/samba/tests/policy.py
similarity index 100%
rename from source4/lib/policy/tests/python/bindings.py
rename to source4/scripting/python/samba/tests/policy.py
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index bc8bf12..d49f253 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -402,7 +402,7 @@ def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, ex
         name = module
     plantestsuite(name, env, args)
 
-planpythontestsuite("none", "selftest.tests.test_suite", name="selftest.py.tests", extra_path=[srcdir()])
+planpythontestsuite("none", "selftest.tests.test_suite", extra_path=[srcdir()])
 planpythontestsuite("none", "api", name="ldb.python", extra_path=['lib/ldb/tests/python'])
 planpythontestsuite("none", "samba.tests.credentials")
 planoldpythontestsuite("dc:local", "samba.tests.gensec", extra_args=['-U"$USERNAME%$PASSWORD"'])
@@ -466,7 +466,7 @@ planpythontestsuite("none", "samba.tests.ntacls")
 plantestsuite("samba4.deletetest.python(dc)", "dc", ['PYTHONPATH="$PYTHONPATH:%s/lib/subunit/python:%s/lib/testtools"' % (srcdir(), srcdir()),
                                                      python, os.path.join(samba4srcdir, "dsdb/tests/python/deletetest.py"),
                                                      '$SERVER', '-U"$USERNAME%$PASSWORD"', '--workgroup=$DOMAIN'])
-planpythontestsuite("none", "bindings", extra_path=["%s/lib/policy/tests/python" % samba4srcdir], name="samba4.policy.python")
+planpythontestsuite("none", "samba.tests.policy")
 plantestsuite("samba4.blackbox.samba3dump", "none", [python, os.path.join(samba4srcdir, "scripting/bin/samba3dump"), os.path.join(samba4srcdir, "../testdata/samba3")], allow_empty_output=True)
 plantestsuite("samba4.blackbox.upgrade", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_s3upgrade.sh"), '$PREFIX/provision'])
 plantestsuite("samba4.blackbox.provision.py", "none", ["PYTHON=%s" % python, os.path.join(samba4srcdir, "setup/tests/blackbox_provision.sh"), '$PREFIX/provision'])


-- 
Samba Shared Repository


More information about the samba-cvs mailing list