summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2020-05-22 23:03:21 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2020-05-22 23:03:21 +0200
commitd44abb47179dd8d319f5df9af042b0e388c7896b (patch)
treec76ef21dd0b03370257cbcd5cf3a69a983b24422
parent7bc76984deafbb9898557d4e39c7e15923f672ec (diff)
downloadpsutil-d44abb47179dd8d319f5df9af042b0e388c7896b.tar.gz
disable windows specific tests on github
-rwxr-xr-xpsutil/tests/test_windows.py4
-rwxr-xr-xscripts/internal/winmake.py6
2 files changed, 5 insertions, 5 deletions
diff --git a/psutil/tests/test_windows.py b/psutil/tests/test_windows.py
index 370ac319..f4078a21 100755
--- a/psutil/tests/test_windows.py
+++ b/psutil/tests/test_windows.py
@@ -41,7 +41,7 @@ from psutil.tests import unittest
if WINDOWS and not PYPY:
with warnings.catch_warnings():
warnings.simplefilter("ignore")
- import win32api # requires "pip install pypiwin32"
+ import win32api # requires "pip install pywin32"
import win32con
import win32process
import wmi # requires "pip install wmi" / "make setup-dev-env"
@@ -68,6 +68,8 @@ def wrap_exceptions(fun):
@unittest.skipIf(PYPY, "pywin32 not available on PYPY") # skip whole module
+# See: https://github.com/giampaolo/psutil/pull/1762#issuecomment-632861854
+@unittest.skipIf(GITHUB_WHEELS, "wmi module unreliable on GITHUB")
class TestCase(PsutilTestCase):
pass
diff --git a/scripts/internal/winmake.py b/scripts/internal/winmake.py
index 8332f585..4f6daaeb 100755
--- a/scripts/internal/winmake.py
+++ b/scripts/internal/winmake.py
@@ -50,7 +50,7 @@ DEPS = [
"wmi",
"requests"
]
-if sys.version_info[:2] <= (3, 0):
+if sys.version_info[:2] <= (2, 7):
DEPS.append('unittest2')
if sys.version_info[:2] <= (2, 7):
DEPS.append('mock')
@@ -58,9 +58,7 @@ if sys.version_info[:2] <= (3, 2):
DEPS.append('ipaddress')
if sys.version_info[:2] <= (3, 4):
DEPS.append('enum34')
-if PYPY:
- pass
-else:
+if not PYPY:
DEPS.append("pywin32")
_cmds = {}