diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-12 22:10:25 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-12 22:10:25 +0100 |
| commit | 04aef38453ff977bf260546545e968fce3ddd599 (patch) | |
| tree | bf2b4f22bc6a056ea2132d7a2f3b3917a469b688 /source4 | |
| parent | fdd75e135a8cb43f946af99120566f744df2a8e0 (diff) | |
| download | samba-04aef38453ff977bf260546545e968fce3ddd599.tar.gz samba-04aef38453ff977bf260546545e968fce3ddd599.tar.bz2 samba-04aef38453ff977bf260546545e968fce3ddd599.zip | |
Fix subunit runner exit codes.
(This used to be commit 7911308dbc1233838e44c533302f77b03ea41148)
Diffstat (limited to 'source4')
| -rwxr-xr-x | source4/scripting/bin/subunitrun | 3 | ||||
| -rw-r--r-- | source4/scripting/python/subunit/__init__.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun index 8dfe2def9c..11ac426589 100755 --- a/source4/scripting/bin/subunitrun +++ b/source4/scripting/bin/subunitrun @@ -21,4 +21,5 @@ from subunit import SubunitTestRunner import sys from unittest import TestProgram -TestProgram(module=None, argv=sys.argv, testRunner=SubunitTestRunner()) +runner = SubunitTestRunner() +TestProgram(module=None, argv=sys.argv, testRunner=runner) diff --git a/source4/scripting/python/subunit/__init__.py b/source4/scripting/python/subunit/__init__.py index 7fcb815937..3abfbf522e 100644 --- a/source4/scripting/python/subunit/__init__.py +++ b/source4/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): @@ -383,5 +383,6 @@ class SubunitTestRunner: def run(self, test): "Run the given test case or test suite." result = TestProtocolClient(self.stream) + test(result) return result |