[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  e22722a... selftest: Cope with empty testsuite results in more places.
       via  11ec291... selftest: Cope with testsuites without any output whatsoever (probably an error though).
       via  f7f1a3a... pynet: Remove unused credentials argument.
      from  fe31b67... s3-registry: only include registry headers when really needed.

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


- Log -----------------------------------------------------------------
commit e22722ae641a43710380faa3e2ca8395e554deb8
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 18 01:39:17 2010 +0200

    selftest: Cope with empty testsuite results in more places.

commit 11ec2916a7ba937aa09057a3a6b990bd29476cc4
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue May 18 00:01:48 2010 +0200

    selftest: Cope with testsuites without any output whatsoever (probably an error though).

commit f7f1a3a4516528be8722bb416428c8abb4bab652
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun May 2 20:02:26 2010 +0200

    pynet: Remove unused credentials argument.

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

Summary of changes:
 selftest/format-subunit |    8 +++++---
 source4/libnet/py_net.c |    7 +++----
 2 files changed, 8 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/format-subunit b/selftest/format-subunit
index 032b990..b4509ab 100755
--- a/selftest/format-subunit
+++ b/selftest/format-subunit
@@ -109,7 +109,7 @@ class PlainFormatter(object):
             if reason is not None:
                 self.output_msg("REASON: %s\n" % (reason,))
             self.suitesfailed.append(name)
-            if self.immediate and not self.verbose:
+            if self.immediate and not self.verbose and name in self.test_output:
                 out += self.test_output[name]
             unexpected = True
 
@@ -157,7 +157,8 @@ class PlainFormatter(object):
 
             for suite in self.suitesfailed:
                 f.write("== %s ==\n" % suite)
-                f.write(self.test_output[suite]+"\n\n")
+                if suite in self.test_output:
+                    f.write(self.test_output[suite]+"\n\n")
 
             f.write("\n")
 
@@ -165,7 +166,8 @@ class PlainFormatter(object):
             for suite in self.suitesfailed:
                 print "=" * 78
                 print "FAIL: %s" % suite
-                print self.test_output[suite]
+                if suite in self.test_output:
+                    print self.test_output[suite]
                 print ""
 
         f.write("= Skipped tests =\n")
diff --git a/source4/libnet/py_net.c b/source4/libnet/py_net.c
index 0592b3f..9b5fa5d 100644
--- a/source4/libnet/py_net.c
+++ b/source4/libnet/py_net.c
@@ -40,12 +40,11 @@ static PyObject *py_net_join(py_net_Object *self, PyObject *args, PyObject *kwar
 	NTSTATUS status;
 	PyObject *result;
 	TALLOC_CTX *mem_ctx;
-	PyObject *py_creds;	
-	const char *kwnames[] = { "domain_name", "netbios_name", "join_type", "level", "credentials", NULL };
+	const char *kwnames[] = { "domain_name", "netbios_name", "join_type", "level", NULL };
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ssiiO:Join", discard_const_p(char *, kwnames), 
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ssii:Join", discard_const_p(char *, kwnames), 
 					 &r.in.domain_name, &r.in.netbios_name, 
-					 &r.in.join_type, &r.in.level, &py_creds))
+					 &r.in.join_type, &r.in.level))
 		return NULL;
 
 	mem_ctx = talloc_new(self->mem_ctx);


-- 
Samba Shared Repository