From 881f610f06fc644bbbd146d939be5cd1adc19a73 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 13 Sep 2010 21:42:32 +0200 Subject: subunit: Pass TestCase objects to startTest rather than test name strings. --- selftest/subunithelper.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'selftest/subunithelper.py') diff --git a/selftest/subunithelper.py b/selftest/subunithelper.py index 255595da45..3328741246 100644 --- a/selftest/subunithelper.py +++ b/selftest/subunithelper.py @@ -47,7 +47,7 @@ def parse_results(msg_ops, statistics, fh): arg = parts[1] if command in ("test", "testing"): msg_ops.control_msg(l) - msg_ops.startTest(arg.rstrip()) + msg_ops.startTest(subunit.RemotedTestCase(arg.rstrip())) open_tests.append(arg.rstrip()) elif command == "time": msg_ops.control_msg(l) @@ -171,9 +171,6 @@ def parse_results(msg_ops, statistics, fh): class SubunitOps(subunit.TestProtocolClient,TestsuiteEnabledTestResult): - def startTest(self, testname): - self._stream.write("test: %s\n" % testname) - def end_test(self, name, result, reason=None): if reason: self._stream.write("%s: %s [\n%s\n]\n" % (result, name, reason)) @@ -253,14 +250,14 @@ class FilterOps(testtools.testresult.TestResult): else: self.output+=msg - def startTest(self, testname): + def startTest(self, test): if self.prefix is not None: - testname = self.prefix + testname + test = subunit.RemotedTestCase(self.prefix + test.id()) if self.strip_ok_output: self.output = "" - self._ops.startTest(testname) + self._ops.startTest(test) def end_test(self, testname, result, unexpected, reason): if self.prefix is not None: -- cgit