[SCM] Samba Shared Repository - branch master updated
Jelmer Vernooij
jelmer at samba.org
Wed Aug 25 20:05:48 MDT 2010
The branch, master has been updated
via 3c7a7bb... subunit: Make sure "]" in failure reason ends up on its own line, so the next subunit parser in the line parses it correctly.
via e260965... manpages: Avoid using Samba-Team specific DTD, which requires net access or modification of /etc/catalogs.
via 64564f7... subunithelper: Pass along lines as normal output when ignoring them for not containing commands.
from 3aab0c7... s3-build: only include rpc_misc.h where needed.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 3c7a7bbb9a6258744523f41935f3967e48056787
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Aug 26 03:50:08 2010 +0200
subunit: Make sure "]" in failure reason ends up on its own line, so the
next subunit parser in the line parses it correctly.
commit e260965929563daad9464c599732b2ab358c9dc5
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Aug 26 03:49:17 2010 +0200
manpages: Avoid using Samba-Team specific DTD, which requires net access
or modification of /etc/catalogs.
commit 64564f7338107f781d814e7721e85cc882106c2b
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Thu Aug 26 02:25:44 2010 +0200
subunithelper: Pass along lines as normal output when ignoring them for not containing commands.
-----------------------------------------------------------------------
Summary of changes:
libcli/nbt/man/nmblookup.1.xml | 12 +-----------
librpc/tools/ndrdump.1.xml | 2 +-
selftest/Subunit.pm | 9 +++++----
selftest/subunithelper.py | 8 ++++++--
4 files changed, 13 insertions(+), 18 deletions(-)
Changeset truncated at 500 lines:
diff --git a/libcli/nbt/man/nmblookup.1.xml b/libcli/nbt/man/nmblookup.1.xml
index 85640da..cf3d401 100644
--- a/libcli/nbt/man/nmblookup.1.xml
+++ b/libcli/nbt/man/nmblookup.1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="nmblookup">
<refmeta>
@@ -106,11 +106,6 @@
</listitem>
</varlistentry>
-
-
- &popt.common.connection;
- &stdarg.help;
-
<varlistentry>
<term>-B <broadcast address></term>
<listitem><para>Send the query to the given broadcast address. Without
@@ -123,8 +118,6 @@
</para></listitem>
</varlistentry>
-
-
<varlistentry>
<term>-U <unicast address></term>
<listitem><para>Do a unicast query to the specified address or
@@ -132,9 +125,6 @@
(along with the <parameter>-R</parameter> option) is needed to
query a WINS server.</para></listitem>
</varlistentry>
-
- &stdarg.server.debug;
- &popt.common.samba;
<varlistentry>
<term>-T</term>
diff --git a/librpc/tools/ndrdump.1.xml b/librpc/tools/ndrdump.1.xml
index 9d66102..b7d2ee8 100644
--- a/librpc/tools/ndrdump.1.xml
+++ b/librpc/tools/ndrdump.1.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE refentry PUBLIC "-//Samba-Team//DTD DocBook V4.2-Based Variant V1.0//EN" "http://www.samba.org/samba/DTD/samba-doc">
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
<refentry id="ndrdump.1">
<refmeta>
diff --git a/selftest/Subunit.pm b/selftest/Subunit.pm
index 42a9ad0..d5c8277 100644
--- a/selftest/Subunit.pm
+++ b/selftest/Subunit.pm
@@ -52,8 +52,8 @@ sub parse_results($$$)
unless ($terminated) {
$statistics->{TESTS_ERROR}++;
- $msg_ops->end_test($testname, "error", 1,
- "reason ($result) interrupted");
+ $msg_ops->end_test($testname, "error", 1,
+ "reason ($result) interrupted\n");
return 1;
}
}
@@ -102,7 +102,7 @@ sub parse_results($$$)
while ($#$open_tests+1 > 0) {
$msg_ops->end_test(pop(@$open_tests), "error", 1,
- "was started but never finished!");
+ "was started but never finished!\n");
$statistics->{TESTS_ERROR}++;
}
@@ -132,7 +132,8 @@ sub end_test($$;$)
my $reason = shift;
if ($reason) {
print "$result: $name [\n";
- print "$reason";
+ print $reason;
+ if (substr($reason, -1, 1) != "\n") { print "\n"; }
print "]\n";
} else {
print "$result: $name\n";
diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py
index d2054a9..06e1fc2 100644
--- a/selftest/subunithelper.py
+++ b/selftest/subunithelper.py
@@ -34,6 +34,7 @@ def parse_results(msg_ops, statistics, fh):
break
parts = l.split(None, 1)
if not len(parts) == 2 or not l.startswith(parts[0]):
+ msg_ops.output_msg(l)
continue
command = parts[0].rstrip(":")
arg = parts[1]
@@ -65,7 +66,7 @@ def parse_results(msg_ops, statistics, fh):
break
else:
reason += l
-
+
if not terminated:
statistics['TESTS_ERROR']+=1
msg_ops.end_test(testname, "error", True,
@@ -128,6 +129,9 @@ def parse_results(msg_ops, statistics, fh):
msg_ops.end_testsuite(testname, "xfail", reason)
elif result == "testsuite-error":
msg_ops.end_testsuite(testname, "error", reason)
+ else:
+ raise AssertionError("Recognized but unhandled result %r" %
+ result)
elif command == "testsuite":
msg_ops.start_testsuite(arg.strip())
elif command == "progress":
@@ -163,7 +167,7 @@ class SubunitOps(object):
def end_test(self, name, result, reason=None):
if reason:
print "%s: %s [" % (result, name)
- print "%s" % reason
+ print reason
print "]"
else:
print "%s: %s" % (result, name)
--
Samba Shared Repository
More information about the samba-cvs
mailing list