summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2016-02-17 08:11:49 -0800
committerGiampaolo Rodola <g.rodola@gmail.com>2016-02-17 08:11:49 -0800
commitb2e2c3ec2dd5d904222d6810dba22f96bb8b4781 (patch)
tree4b71361c1dbb463071a75bc4c55ab1358f11562c
parentcc1e74aeb3866f4324904a96fdeb3d4d5c879c51 (diff)
downloadpsutil-b2e2c3ec2dd5d904222d6810dba22f96bb8b4781.tar.gz
fix script issues on windows
-rw-r--r--psutil/tests/test_misc.py4
-rwxr-xr-xscripts/procsmem.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py
index 1257a1ef..f0a24234 100644
--- a/psutil/tests/test_misc.py
+++ b/psutil/tests/test_misc.py
@@ -18,6 +18,7 @@ import sys
from psutil import LINUX
from psutil import NETBSD
from psutil import OPENBSD
+from psutil import OSX
from psutil import POSIX
from psutil import WINDOWS
from psutil._common import supports_ipv6
@@ -392,8 +393,7 @@ class TestScripts(unittest.TestCase):
def test_pmap(self):
self.assert_stdout('pmap.py', args=str(os.getpid()))
- @unittest.skipUnless(hasattr(psutil.Process, "memory_full_info"),
- "memory_full_info() not supported")
+ @unittest.skipUnless(OSX or WINDOWS or LINUX, "uss not available")
def test_procsmem(self):
self.assert_stdout('procsmem.py')
diff --git a/scripts/procsmem.py b/scripts/procsmem.py
index 5236f4f7..494fd6ab 100755
--- a/scripts/procsmem.py
+++ b/scripts/procsmem.py
@@ -41,7 +41,7 @@ import sys
import psutil
-if not psutil.LINUX or psutil.OSX or psutil.WINDOWS:
+if not (psutil.LINUX or psutil.OSX or psutil.WINDOWS):
sys.exit("platform not supported")