comparison tests/run-tests.py @ 21500:130cc0d7bfde

run-tests: don't trap exceptions in Test.runTest() Exceptions are all handled in Test.run(). This code was redundant since the unittest test wrapper class was merged into Test.
author Gregory Szorc <gregory.szorc@gmail.com>
date Sun, 20 Apr 2014 18:23:48 -0700
parents d22f4e72dcd5
children 98a0c58ee200
comparison
equal deleted inserted replaced
21499:d22f4e72dcd5 21500:130cc0d7bfde
483 self._daemonpids.append(env['DAEMON_PIDS']) 483 self._daemonpids.append(env['DAEMON_PIDS'])
484 self._createhgrc(env['HGRCPATH']) 484 self._createhgrc(env['HGRCPATH'])
485 485
486 vlog('# Test', self.name) 486 vlog('# Test', self.name)
487 487
488 try: 488 ret, out = self._run(replacements, env)
489 ret, out = self._run(replacements, env) 489 self._finished = True
490 self._finished = True 490 self._ret = ret
491 self._ret = ret 491 self._out = out
492 self._out = out
493 except KeyboardInterrupt:
494 raise
495 except Exception, e:
496 return self.fail('Exception during execution: %s' % e, 255)
497 492
498 def describe(ret): 493 def describe(ret):
499 if ret < 0: 494 if ret < 0:
500 return 'killed by signal: %d' % -ret 495 return 'killed by signal: %d' % -ret
501 return 'returned error code %d' % ret 496 return 'returned error code %d' % ret