[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-782-g842b496

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  842b4969cd08a8acc5584cfdcf1aaf8a751e4fa3 (commit)
       via  7911308dbc1233838e44c533302f77b03ea41148 (commit)
       via  c474a2bb83a3e28a0b83f3b8ca1b646742dfca3d (commit)
      from  9620b86e96e8065c0ff6db0d95130ab53581d468 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit 842b4969cd08a8acc5584cfdcf1aaf8a751e4fa3
Merge: 7911308dbc1233838e44c533302f77b03ea41148 9620b86e96e8065c0ff6db0d95130ab53581d468
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Feb 12 22:15:06 2008 +0100

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

commit 7911308dbc1233838e44c533302f77b03ea41148
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Feb 12 22:10:25 2008 +0100

    Fix subunit runner exit codes.

commit c474a2bb83a3e28a0b83f3b8ca1b646742dfca3d
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Tue Feb 12 21:59:23 2008 +0100

    Correctly increment counters in Subunit test runner.

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

Summary of changes:
 source/scripting/bin/subunitrun             |    5 ++---
 source/scripting/python/subunit/__init__.py |    6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/scripting/bin/subunitrun b/source/scripting/bin/subunitrun
index 7142abe..11ac426 100755
--- a/source/scripting/bin/subunitrun
+++ b/source/scripting/bin/subunitrun
@@ -21,6 +21,5 @@ from subunit import SubunitTestRunner
 import sys
 from unittest import TestProgram
 
-program = TestProgram(module=None, argv=sys.argv, 
-		              testRunner=SubunitTestRunner())
-program.runTests()
+runner = SubunitTestRunner()
+TestProgram(module=None, argv=sys.argv, testRunner=runner)
diff --git a/source/scripting/python/subunit/__init__.py b/source/scripting/python/subunit/__init__.py
index 4d3434a..3abfbf5 100644
--- a/source/scripting/python/subunit/__init__.py
+++ b/source/scripting/python/subunit/__init__.py
@@ -209,7 +209,7 @@ class TestProtocolClient(unittest.TestResult):
     """A class that looks like a TestResult and informs a TestProtocolServer."""
 
     def __init__(self, stream):
-        unittest.TestResult.__init__(self)
+        super(TestProtocolClient, self).__init__()
         self._stream = stream
 
     def addError(self, test, error):
@@ -218,6 +218,7 @@ class TestProtocolClient(unittest.TestResult):
         for line in self._exc_info_to_string(error, test).splitlines():
             self._stream.write("%s\n" % line)
         self._stream.write("]\n")
+        super(TestProtocolClient, self).addError(test, error)
 
     def addFailure(self, test, error):
         """Report a failure in test test."""
@@ -225,14 +226,17 @@ class TestProtocolClient(unittest.TestResult):
         for line in self._exc_info_to_string(error, test).splitlines():
             self._stream.write("%s\n" % line)
         self._stream.write("]\n")
+        super(TestProtocolClient, self).addFailure(test, error)
 
     def addSuccess(self, test):
         """Report a success in a test."""
         self._stream.write("successful: %s\n" % (test.shortDescription() or str(test)))
+        super(TestProtocolClient, self).addSuccess(test)
 
     def startTest(self, test):
         """Mark a test as starting its test run."""
         self._stream.write("test: %s\n" % (test.shortDescription() or str(test)))
+        super(TestProtocolClient, self).startTest(test)
 
 
 def RemoteError(description=""):


-- 
Samba Shared Repository