Repository: qpid-dispatch Updated Branches: refs/heads/master 36a51112c -> 9442bb0b2
NO-JIRA: print valgrind errors directly from system tests. Print valgrind errors in system test output as well as dumping to file. Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/a0a8f97b Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/a0a8f97b Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/a0a8f97b Branch: refs/heads/master Commit: a0a8f97bc49d6c68b13d3b2895fe565c4383c875 Parents: 36a5111 Author: Alan Conway <[email protected]> Authored: Fri Dec 16 15:27:41 2016 -0500 Committer: Alan Conway <[email protected]> Committed: Mon Dec 19 17:55:52 2016 -0500 ---------------------------------------------------------------------- tests/system_test.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/a0a8f97b/tests/system_test.py ---------------------------------------------------------------------- diff --git a/tests/system_test.py b/tests/system_test.py index 194239d..7d8c95d 100755 --- a/tests/system_test.py +++ b/tests/system_test.py @@ -216,7 +216,7 @@ class Process(subprocess.Popen): self.name = name or os.path.basename(args[0]) self.args, self.expect = args, expect self.outdir = os.getcwd() - self.outfile = self.unique(self.name) + self.outfile = os.path.abspath(self.unique(self.name)) self.out = open(self.outfile + '.out', 'w') with open(self.outfile + '.cmd', 'w') as f: f.write("%s\n" % ' '.join(args)) self.torndown = False @@ -260,7 +260,7 @@ class Process(subprocess.Popen): actual = "exit %s"%status assert condition, "Expected %s but %s: %s"%(expect, actual, self.name) assert not self.valgrind_error or status != self.valgrind_error, \ - "Valgrind detected errors! See log file %s/%s.vg" % (self.outdir, self.outfile) + "Valgrind errors (in %s)\n\n%s\n" % (self.outfile+".vg", open(self.outfile+".vg").read()) if self.expect == Process.RUNNING: check(status is None, "still running") elif self.expect == Process.EXIT_OK: @@ -558,7 +558,7 @@ class Tester(object): break except Exception, e: errors.append(e) - assert not errors, "Errors during teardown: %s" % errors + assert not errors, "Errors during teardown: \n%s" % "\n----".join([str(e) for e in errors]) def cleanup(self, x): --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
