The branch, master has been updated via 21499a1... selftest: reason may be None from 4f4addd... s4-test: oLschema2ldif doesn't take -H any more
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 21499a148e4b6600d13977eb97c1a77d9bf5fd4c Author: Andrew Tridgell <tri...@samba.org> Date: Tue Mar 30 16:27:09 2010 +1100 selftest: reason may be None jelmer, please check ----------------------------------------------------------------------- Summary of changes: selftest/format-subunit | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/selftest/format-subunit b/selftest/format-subunit index 71fa018..3747082 100755 --- a/selftest/format-subunit +++ b/selftest/format-subunit @@ -79,7 +79,7 @@ class PlainFormatter(object): if result in ("success", "xfail"): self.suites_ok+=1 else: - self.output_msg("ERROR: Testsuite[%s]\nREASON: %s\n" % (name, reason)) + self.output_msg("ERROR: Testsuite[%s]\nREASON: %s\n" % (name, reason or '')) self.suitesfailed.append(name) if self.immediate and not self.verbose: out += self.test_output[name] @@ -107,6 +107,8 @@ class PlainFormatter(object): 'success': '.'}.get(result, "?(%s)" % result)) return + if reason is None: + reason = '' reason = reason.strip() self.test_output[self.name] += "UNEXPECTED(%s): %s\nREASON: %s\n" % (result, testname, reason) -- Samba Shared Repository