equal
deleted
inserted
replaced
660 msg += 'output changed and ' + describe(ret) |
660 msg += 'output changed and ' + describe(ret) |
661 else: |
661 else: |
662 msg += 'output changed' |
662 msg += 'output changed' |
663 |
663 |
664 return self.fail(msg, ret) |
664 return self.fail(msg, ret) |
|
665 elif ret: |
|
666 return self.fail(describe(ret), ret) |
|
667 else: |
|
668 return self.success() |
665 |
669 |
666 def _run(self, testtmp, replacements, env): |
670 def _run(self, testtmp, replacements, env): |
667 raise NotImplemented('Subclasses must implement Test.run()') |
671 raise NotImplemented('Subclasses must implement Test.run()') |
668 |
672 |
669 def _getreplacements(self, testtmp): |
673 def _getreplacements(self, testtmp): |
1161 f = open(err, "wb") |
1165 f = open(err, "wb") |
1162 for line in out: |
1166 for line in out: |
1163 f.write(line) |
1167 f.write(line) |
1164 f.close() |
1168 f.close() |
1165 |
1169 |
1166 if result: |
|
1167 pass |
|
1168 elif ret: |
|
1169 result = t.fail(describe(ret), ret) |
|
1170 else: |
|
1171 result = t.success() |
|
1172 |
|
1173 if not options.verbose: |
1170 if not options.verbose: |
1174 iolock.acquire() |
1171 iolock.acquire() |
1175 sys.stdout.write(result[0]) |
1172 sys.stdout.write(result[0]) |
1176 sys.stdout.flush() |
1173 sys.stdout.flush() |
1177 iolock.release() |
1174 iolock.release() |