sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

subunit: Use standard functions for addSuccess, addExpectedFail,

Browse Source 
addFailure, addSkip.
This commit is contained in:
Jelmer Vernooij 2010-09-13 22:09:46 +02:00
parent c1fe7b498a
commit b61cc18972
1 changed files with 62 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
selftest/subunithelper.py
View File

@ -33,7 +33,7 @@ class TestsuiteEnabledTestResult(testtools.testresult.TestResult):
def parse_results(msg_ops, statistics, fh): def parse_results(msg_ops, statistics, fh):
expected_fail = 0 expected_fail = 0
open_tests = [] open_tests = {}
while fh: while fh:
l = fh.readline() l = fh.readline()
@ -47,8 +47,12 @@ def parse_results(msg_ops, statistics, fh):
arg = parts[1] arg = parts[1]
if command in ("test", "testing"): if command in ("test", "testing"):
msg_ops.control_msg(l) msg_ops.control_msg(l)
msg_ops.startTest(subunit.RemotedTestCase(arg.rstrip())) name = arg.rstrip()
open_tests.append(arg.rstrip()) test = subunit.RemotedTestCase(name)
if name in open_tests:
msg_ops.addError(open_tests.pop(name), "Test already running")
msg_ops.startTest(test)
open_tests[name] = test
elif command == "time": elif command == "time":
msg_ops.control_msg(l) msg_ops.control_msg(l)
try: try:
@ -85,46 +89,47 @@ def parse_results(msg_ops, statistics, fh):
reason = None reason = None
if result in ("success", "successful"): if result in ("success", "successful"):
try: try:
open_tests.remove(testname) test = open_tests.pop(testname)
except ValueError: except KeyError:
statistics['TESTS_ERROR']+=1 statistics['TESTS_ERROR']+=1
msg_ops.addError(subunit.RemotedTestCase(testname), "Test was never started") msg_ops.addError(subunit.RemotedTestCase(testname), "Test was never started")
else: else:
statistics['TESTS_EXPECTED_OK']+=1 statistics['TESTS_EXPECTED_OK']+=1
msg_ops.end_test(testname, "success", False, reason) msg_ops.addSuccess(test, reason)
elif result in ("xfail", "knownfail"): elif result in ("xfail", "knownfail"):
try: try:
open_tests.remove(testname) test = open_tests.pop(testname)
except ValueError: except KeyError:
statistics['TESTS_ERROR']+=1 statistics['TESTS_ERROR']+=1
msg_ops.addError(subunit.RemotedTestCase(testname), "Test was never started") msg_ops.addError(subunit.RemotedTestCase(testname), "Test was never started")
else: else:
statistics['TESTS_EXPECTED_FAIL']+=1 statistics['TESTS_EXPECTED_FAIL']+=1
msg_ops.end_test(testname, "xfail", False, reason) msg_ops.addExpectedFail(test, reason)
expected_fail+=1 expected_fail+=1
elif result in ("failure", "fail"): elif result in ("failure", "fail"):
try: try:
open_tests.remove(testname) test = open_tests.pop(testname)
except ValueError: except KeyError:
statistics['TESTS_ERROR']+=1 statistics['TESTS_ERROR']+=1
msg_ops.addError(subunit.RemotedTestCase(testname), "Test was never started") msg_ops.addError(subunit.RemotedTestCase(testname), "Test was never started")
else: else:
statistics['TESTS_UNEXPECTED_FAIL']+=1 statistics['TESTS_UNEXPECTED_FAIL']+=1
msg_ops.end_test(testname, "failure", True, reason) msg_ops.addFailure(test, reason)
elif result == "skip": elif result == "skip":
statistics['TESTS_SKIP']+=1 statistics['TESTS_SKIP']+=1
# Allow tests to be skipped without prior announcement of test # Allow tests to be skipped without prior announcement of test
last = open_tests.pop() try:
if last is not None and last != testname: test = open_tests.pop(testname)
open_tests.append(testname) except KeyError:
msg_ops.end_test(testname, "skip", False, reason) test = subunit.RemotedTestCase(testname)
msg_ops.addSkip(test, reason)
elif result == "error": elif result == "error":
statistics['TESTS_ERROR']+=1 statistics['TESTS_ERROR']+=1
try: try:
open_tests.remove(testname) test = open_tests.pop(testname)
except ValueError: except KeyError:
pass test = subunit.RemotedTestCase(testname)
msg_ops.addError(subunit.RemotedTestCase(testname), reason) msg_ops.addError(test, reason)
elif result == "skip-testsuite": elif result == "skip-testsuite":
msg_ops.skip_testsuite(testname) msg_ops.skip_testsuite(testname)
elif result == "testsuite-success": elif result == "testsuite-success":
@ -170,6 +175,18 @@ class SubunitOps(subunit.TestProtocolClient,TestsuiteEnabledTestResult):
def addError(self, test, details=None): def addError(self, test, details=None):
self.end_test(test.id(), "error", details) self.end_test(test.id(), "error", details)
def addSuccess(self, test, details=None):
self.end_test(test.id(), "success", details)
def addExpectedFail(self, test, details=None):
self.end_test(test.id(), "xfail", details)
def addFailure(self, test, details=None):
self.end_test(test.id(), "failure", details)
def addSkip(self, test, details=None):
self.end_test(test.id(), "skip", details)
def end_test(self, name, result, reason=None): def end_test(self, name, result, reason=None):
if reason: if reason:
self._stream.write("%s: %s [\n%s\n]\n" % (result, name, reason)) self._stream.write("%s: %s [\n%s\n]\n" % (result, name, reason))
@ -250,21 +267,39 @@ class FilterOps(testtools.testresult.TestResult):
self.output+=msg self.output+=msg
def startTest(self, test): def startTest(self, test):
if self.prefix is not None: test = self._add_prefix(test)
test = subunit.RemotedTestCase(self.prefix + test.id())
if self.strip_ok_output: if self.strip_ok_output:
self.output = "" self.output = ""
self._ops.startTest(test) self._ops.startTest(test)
def _add_prefix(self, test):
if self.prefix is not None:
return subunit.RemotedTestCase(self.prefix + test.id())
else:
return test
def addError(self, test, details=None): def addError(self, test, details=None):
self.end_test(test.id(), "error", details) test = self._add_prefix(test)
self.end_test(test.id(), "error", True, details)
def addSkip(self, test, details=None):
test = self._add_prefix(test)
self.end_test(test.id(), "skip", False, details)
def addExpectedFail(self, test, details=None):
test = self._add_prefix(test)
self.end_test(test.id(), "xfail", False, details)
def addFailure(self, test, details=None):
test = self._add_prefix(test)
self.end_test(test.id(), "failure", True, details)
def addSuccess(self, test, details=None):
test = self._add_prefix(test)
self.end_test(test.id(), "success", False, details)
def end_test(self, testname, result, unexpected, reason): def end_test(self, testname, result, unexpected, reason):
if self.prefix is not None:
testname = self.prefix + testname
if result in ("fail", "failure") and not unexpected: if result in ("fail", "failure") and not unexpected:
result = "xfail" result = "xfail"
self.xfail_added+=1 self.xfail_added+=1