[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  17c529a s4:selftest: samba4.urgent_replication.python needs to run as "dc:local"
       via  b4428d7 selftest/selftesthelpers.py: construct a fullname with env in plantestsuite_idlist()
       via  77c73f1 selftest: planpythontestsuite() should fill 'name' is it's None
      from  72cabbb s3:smb2_flush: outbody only needs 4 bytes

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


- Log -----------------------------------------------------------------
commit 17c529a35ffe9f850403c80e25ccaada86d42625
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Nov 14 10:51:56 2011 +0100

    s4:selftest: samba4.urgent_replication.python needs to run as "dc:local"
    
    As it uses local files on the dc.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Mon Nov 14 15:48:33 CET 2011 on sn-devel-104

commit b4428d771fcd665336fa9217a71768ca292600ae
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Nov 14 14:10:17 2011 +0100

    selftest/selftesthelpers.py: construct a fullname with env in plantestsuite_idlist()
    
    Like we already do for plantestsuite_loadlist()
    
    metze

commit 77c73f1d925781a6afe64bd60c0e2438957c7a31
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Nov 14 12:21:38 2011 +0100

    selftest: planpythontestsuite() should fill 'name' is it's None
    
    Otherwise make test shows tests with name "None".
    
    metze

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

Summary of changes:
 selftest/selftesthelpers.py |    8 +++++++-
 source4/selftest/tests.py   |    2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftesthelpers.py b/selftest/selftesthelpers.py
index a7924d6..c2f4348 100644
--- a/selftest/selftesthelpers.py
+++ b/selftest/selftesthelpers.py
@@ -129,7 +129,11 @@ def plantestsuite_loadlist(name, env, cmdline):
 
 def plantestsuite_idlist(name, env, cmdline):
     print "-- TEST-IDLIST --"
-    print name
+    if env == "none":
+        fullname = name
+    else:
+        fullname = "%s(%s)" % (name, env)
+    print fullname
     print env
     if isinstance(cmdline, list):
         cmdline = " ".join(cmdline)
@@ -159,6 +163,8 @@ def planperltestsuite(name, path):
 
 
 def planpythontestsuite(env, module, name=None, extra_path=[]):
+    if name is None:
+        name = module
     pypath = list(extra_path)
     if not has_system_subunit_run:
         pypath.extend(["%s/lib/subunit/python" % srcdir(),
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 4e6ce3d..0a1ff7a 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -439,7 +439,7 @@ planoldpythontestsuite("dc", "dsdb_schema_info",
         extra_path=[os.path.join(samba4srcdir, 'dsdb/tests/python')],
         name="samba4.schemaInfo.python(dc)",
         extra_args=['-U"$DOMAIN/$DC_USERNAME%$DC_PASSWORD"'])
-plantestsuite("samba4.urgent_replication.python(dc)", "dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/urgent_replication.py"), '$PREFIX_ABS/dc/private/sam.ldb'], allow_empty_output=True)
+plantestsuite("samba4.urgent_replication.python(dc)", "dc:local", [python, os.path.join(samba4srcdir, "dsdb/tests/python/urgent_replication.py"), '$PREFIX_ABS/dc/private/sam.ldb'], allow_empty_output=True)
 plantestsuite("samba4.ldap.dirsync.python(dc)", "dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/dirsync.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN'])
 plantestsuite("samba4.ldap.sites.python(dc)", "dc", [python, os.path.join(samba4srcdir, "dsdb/tests/python/sites.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN'])
 for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:


-- 
Samba Shared Repository