diff options
Diffstat (limited to 'psutil/tests/test_contracts.py')
| -rwxr-xr-x | psutil/tests/test_contracts.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/psutil/tests/test_contracts.py b/psutil/tests/test_contracts.py index 6859f69f..7f299a62 100755 --- a/psutil/tests/test_contracts.py +++ b/psutil/tests/test_contracts.py @@ -452,10 +452,9 @@ class TestFetchAllProcesses(PsutilTestCase): self.assertIsInstance(part, str) def exe(self, ret, info): - self.assertIsInstance(ret, (str, unicode, type(None))) - if not ret: - self.assertEqual(ret, '') - else: + self.assertIsInstance(ret, (str, unicode)) + self.assertEqual(ret.strip(), ret) + if ret: if WINDOWS and not ret.endswith('.exe'): return # May be "Registry", "MemCompression", ... assert os.path.isabs(ret), ret @@ -520,7 +519,8 @@ class TestFetchAllProcesses(PsutilTestCase): def username(self, ret, info): self.assertIsInstance(ret, str) - assert ret + self.assertEqual(ret.strip(), ret) + assert ret.strip() def status(self, ret, info): self.assertIsInstance(ret, str) @@ -619,6 +619,7 @@ class TestFetchAllProcesses(PsutilTestCase): for f in ret: self.assertIsInstance(f.fd, int) self.assertIsInstance(f.path, str) + self.assertEqual(f.path.strip(), f.path) if WINDOWS: self.assertEqual(f.fd, -1) elif LINUX: @@ -651,8 +652,9 @@ class TestFetchAllProcesses(PsutilTestCase): check_connection_ntuple(conn) def cwd(self, ret, info): - if ret: # 'ret' can be None or empty - self.assertIsInstance(ret, str) + self.assertIsInstance(ret, (str, unicode)) + self.assertEqual(ret.strip(), ret) + if ret: assert os.path.isabs(ret), ret try: st = os.stat(ret) |