diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-11-05 01:33:11 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-11-05 01:33:11 +0100 |
commit | e2cacdad028a02dccc5962a7043a1c113d202619 (patch) | |
tree | 14fa55ecde02ee76ce697e3f9dc3c0249a091a48 | |
parent | 5274e8a6b9655de38b32b22762d931e071694d43 (diff) | |
download | psutil-e2cacdad028a02dccc5962a7043a1c113d202619.tar.gz |
speedup fetch all process test by using oneshot
-rwxr-xr-x | psutil/tests/test_process.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py index c3e9e290..c189b1a0 100755 --- a/psutil/tests/test_process.py +++ b/psutil/tests/test_process.py @@ -1557,10 +1557,10 @@ class TestFetchAllProcesses(unittest.TestCase): default = object() failures = [] - for name in attrs: - for p in psutil.process_iter(): - ret = default - try: + for p in psutil.process_iter(): + with p.oneshot(): + for name in attrs: + ret = default try: args = () attr = getattr(p, name, None) @@ -1583,23 +1583,23 @@ class TestFetchAllProcesses(unittest.TestCase): self.assertEqual(err.name, p.name()) self.assertTrue(str(err)) self.assertTrue(err.msg) + except Exception as err: + s = '\n' + '=' * 70 + '\n' + s += "FAIL: test_%s (proc=%s" % (name, p) + if ret != default: + s += ", ret=%s)" % repr(ret) + s += ')\n' + s += '-' * 70 + s += "\n%s" % traceback.format_exc() + s = "\n".join((" " * 4) + i for i in s.splitlines()) + s += '\n' + failures.append(s) + break else: if ret not in (0, 0.0, [], None, '', {}): assert ret, ret meth = getattr(self, name) meth(ret, p) - except Exception as err: - s = '\n' + '=' * 70 + '\n' - s += "FAIL: test_%s (proc=%s" % (name, p) - if ret != default: - s += ", ret=%s)" % repr(ret) - s += ')\n' - s += '-' * 70 - s += "\n%s" % traceback.format_exc() - s = "\n".join((" " * 4) + i for i in s.splitlines()) - s += '\n' - failures.append(s) - break if failures: self.fail(''.join(failures)) |