summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2020-04-25 16:03:09 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2020-04-25 16:03:09 +0200
commitcffb476788b89bb9de8f878d65a1e36b4a7df686 (patch)
tree6cb0870116eff633cb5ead4e0d80163e3df98201
parentcd592b4b1190d34d15ae5c559c15e7797cad14c8 (diff)
downloadpsutil-cffb476788b89bb9de8f878d65a1e36b4a7df686.tar.gz
refact
-rwxr-xr-xpsutil/tests/runner.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/psutil/tests/runner.py b/psutil/tests/runner.py
index 16d0d9b2..a9f43c9d 100755
--- a/psutil/tests/runner.py
+++ b/psutil/tests/runner.py
@@ -181,15 +181,16 @@ class Runner:
tname = t[0].id()
self.failed_tnames.add(tname)
- def _run(self, suite):
+ def _run(self, suite, parallel=False):
try:
result = self.runner.run(suite)
except (KeyboardInterrupt, SystemExit):
result = self.runner.result
result.printErrors()
- return sys.exit(1)
- self._save_result(result)
- return result
+ raise sys.exit(1)
+ else:
+ self._save_result(result)
+ return result
def _finalize(self, success):
if success:
@@ -203,8 +204,8 @@ class Runner:
"""Run tests serially (1 process)."""
if suite is None:
suite = self.loader.all()
- res = self._run(suite)
- self._finalize(res.wasSuccessful())
+ result = self._run(suite)
+ self._finalize(result.wasSuccessful())
def run_last_failed(self):
"""Run tests which failed in the last run."""