diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-04-05 07:52:39 -0700 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-04-05 07:52:39 -0700 |
commit | 2eb7b3bc2982f94afee4f4cbd93764d9708e206d (patch) | |
tree | 1c5a7135f46912e744fef67ba04f78d0329d1862 | |
parent | 259ea9fed918cbbcf40e0596c8d2f8d3544996fb (diff) | |
download | psutil-2eb7b3bc2982f94afee4f4cbd93764d9708e206d.tar.gz |
fix windows failure re. py 2 vs. 3
-rwxr-xr-x | psutil/tests/test_windows.py | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/psutil/tests/test_windows.py b/psutil/tests/test_windows.py index 70c99b4b..5a998dd4 100755 --- a/psutil/tests/test_windows.py +++ b/psutil/tests/test_windows.py @@ -25,6 +25,7 @@ from psutil.tests import APPVEYOR from psutil.tests import get_test_subprocess from psutil.tests import HAS_BATTERY from psutil.tests import mock +from psutil.tests import PY3 from psutil.tests import reap_children from psutil.tests import retry_on_failure from psutil.tests import sh @@ -826,17 +827,22 @@ class TestServices(unittest.TestCase): self.assertEqual(serv, s) def test_win_service_get(self): - name = next(psutil.win_service_iter()).name() + ERROR_SERVICE_DOES_NOT_EXIST = \ + psutil._psplatform.cext.ERROR_SERVICE_DOES_NOT_EXIST + ERROR_ACCESS_DENIED = psutil._psplatform.cext.ERROR_ACCESS_DENIED + name = next(psutil.win_service_iter()).name() with self.assertRaises(psutil.NoSuchProcess) as cm: psutil.win_service_get(name + '???') self.assertEqual(cm.exception.name, name + '???') # test NoSuchProcess service = psutil.win_service_get(name) - exc = WindowsError( - 0, "", 0, - psutil._psplatform.cext.ERROR_SERVICE_DOES_NOT_EXIST) + if PY3: + args = (0, "msg", 0, ERROR_SERVICE_DOES_NOT_EXIST) + else: + args = (ERROR_SERVICE_DOES_NOT_EXIST, "msg") + exc = WindowsError(*args) with mock.patch("psutil._psplatform.cext.winservice_query_status", side_effect=exc): self.assertRaises(psutil.NoSuchProcess, service.status) @@ -845,9 +851,11 @@ class TestServices(unittest.TestCase): self.assertRaises(psutil.NoSuchProcess, service.username) # test AccessDenied - exc = WindowsError( - 0, "", 0, - psutil._psplatform.cext.ERROR_ACCESS_DENIED) + if PY3: + args = (0, "msg", 0, ERROR_ACCESS_DENIED) + else: + args = (ERROR_ACCESS_DENIED, "msg") + exc = WindowsError(*args) with mock.patch("psutil._psplatform.cext.winservice_query_status", side_effect=exc): self.assertRaises(psutil.AccessDenied, service.status) |