[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  21b58b5 samba.join: Fix multiple spaces.
       via  1aa291c selftest: Move some tests to common test script.
       via  1080b6c selftests.tests: Remove reference to Samba 4.
       via  2adf27a samba.provision.sambadns: Use == to compare strings, not 'is'.
      from  cabd2b2 s3fs-printing: Simplify the comment and location handling.

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


- Log -----------------------------------------------------------------
commit 21b58b5eacb67b4dee6e7efe90bd529bbfd6ef77
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Oct 11 17:23:13 2012 +0200

    samba.join: Fix multiple spaces.
    
    Autobuild-User(master): Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date(master): Thu Oct 11 20:30:43 CEST 2012 on sn-devel-104

commit 1aa291c331c29c2f5ee4572b660c4c2061755856
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Oct 5 11:46:25 2012 +0200

    selftest: Move some tests to common test script.

commit 1080b6c2caf1191fd896f3caf38e576a00b01982
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Oct 5 11:39:34 2012 +0200

    selftests.tests: Remove reference to Samba 4.

commit 2adf27a99b999a4fd0329d9fa398a9208b60e367
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Thu Oct 11 17:11:44 2012 +0200

    samba.provision.sambadns: Use == to compare strings, not 'is'.

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

Summary of changes:
 selftest/tests.py                                  |   10 ++++++----
 source4/scripting/python/samba/join.py             |    2 +-
 .../scripting/python/samba/provision/sambadns.py   |    2 +-
 source4/selftest/tests.py                          |    2 --
 4 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/tests.py b/selftest/tests.py
index 506ed73..d9ad9e9 100644
--- a/selftest/tests.py
+++ b/selftest/tests.py
@@ -1,16 +1,16 @@
 #!/usr/bin/python
 # This script generates a list of testsuites that should be run as part of
-# the Samba 4 test suite.
+# the Samba test suite.
 
 # The output of this script is parsed by selftest.pl, which then decides
 # which of the tests to actually run. It will, for example, skip all tests
 # listed in selftest/skip or only run a subset during "make quicktest".
 
-# The idea is that this script outputs all of the tests of Samba 4, not
+# The idea is that this script outputs all of the tests of Samba, not
 # just those that are known to pass, and list those that should be skipped
 # or are known to fail in selftest/skip or selftest/knownfail. This makes it
-# very easy to see what functionality is still missing in Samba 4 and makes
-# it possible to run the testsuite against other servers, such as Samba 3 or
+# very easy to see what functionality is still missing in Samba and makes
+# it possible to run the testsuite against other servers, such as
 # Windows that have a different set of features.
 
 # The syntax for a testsuite is "-- TEST --" on a single line, followed
@@ -21,3 +21,5 @@
 from selftesthelpers import *
 
 planpythontestsuite("none", "samba.tests.source")
+planpythontestsuite("none", "selftest.tests.test_suite", extra_path=[srcdir()])
+planpythontestsuite("none", "subunit")
diff --git a/source4/scripting/python/samba/join.py b/source4/scripting/python/samba/join.py
index 7b511f8..c55c22c 100644
--- a/source4/scripting/python/samba/join.py
+++ b/source4/scripting/python/samba/join.py
@@ -749,7 +749,7 @@ class dc_join(object):
             print "Done with always replicated NC (base, config, schema)"
 
             for nc in (ctx.domaindns_zone, ctx.forestdns_zone):
-                if nc  in ctx.nc_list:
+                if nc in ctx.nc_list:
                     print "Replicating %s" % (str(nc))
                     repl.replicate(nc, source_dsa_invocation_id,
                                     destination_dsa_guid, rodc=ctx.RODC,
diff --git a/source4/scripting/python/samba/provision/sambadns.py b/source4/scripting/python/samba/provision/sambadns.py
index 576a33f..a66fde1 100644
--- a/source4/scripting/python/samba/provision/sambadns.py
+++ b/source4/scripting/python/samba/provision/sambadns.py
@@ -1017,7 +1017,7 @@ def setup_ad_dns(samdb, secretsdb, domainsid, names, paths, lp, logger,
     if not is_valid_os_level(os_level):
         raise Exception("Invalid os level: %r" % os_level)
 
-    if dns_backend is "NONE":
+    if dns_backend == "NONE":
         logger.info("No DNS backend set, not configuring DNS")
         return
 
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 756b28c..d99c4b0 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -417,7 +417,6 @@ def planoldpythontestsuite(env, module, name=None, extra_path=[], environ={}, ex
         name = module
     plantestsuite(name, env, args)
 
-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"'])
@@ -450,7 +449,6 @@ planpythontestsuite("dc:local", "samba.tests.samba_tool.user")
 planpythontestsuite("dc:local", "samba.tests.samba_tool.group")
 planpythontestsuite("plugin_s4_dc:local", "samba.tests.samba_tool.ntacl")
 
-planpythontestsuite("none", "subunit")
 planpythontestsuite("dc:local", "samba.tests.dcerpc.rpcecho")
 planpythontestsuite("none", "wafsamba.tests.test_suite", extra_path=[os.path.join(samba4srcdir, "..", "buildtools"), os.path.join(samba4srcdir, "..", "buildtools", "wafadmin")])
 planoldpythontestsuite("dc:local", "samba.tests.dcerpc.registry", extra_args=['-U"$USERNAME%$PASSWORD"'])


-- 
Samba Shared Repository