summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2016-10-15 13:05:23 +0200
committerGiampaolo Rodola <g.rodola@gmail.com>2016-10-15 13:05:23 +0200
commitef2ac7917e747acea53584dcb98fd9697d39f645 (patch)
tree4eb61658b01397d0cf3ded0cc57713920a75b98a
parent2b162e40d2b1e919818a2f00a9ec81a825a5a17b (diff)
downloadpsutil-ef2ac7917e747acea53584dcb98fd9697d39f645.tar.gz
disable unicode tests on OSX + travis
-rwxr-xr-xpsutil/tests/test_process.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py
index dfca1b6c..967df104 100755
--- a/psutil/tests/test_process.py
+++ b/psutil/tests/test_process.py
@@ -1450,7 +1450,7 @@ class TestProcess(unittest.TestCase):
self.assertTrue(psutil.pid_exists(0))
def test_Popen(self):
- with psutil.Popen([PYTHON, "V"], stdout=subprocess.PIPE,
+ with psutil.Popen([PYTHON, "-V"], stdout=subprocess.PIPE,
stderr=subprocess.PIPE) as proc:
proc.name()
proc.stdin
@@ -1869,6 +1869,7 @@ if POSIX and os.getuid() == 0:
# ===================================================================
+@unittest.skipIf(OSX and TRAVIS, "fails on OSX + TRAVIS")
class TestUnicode(unittest.TestCase):
# See: https://github.com/giampaolo/psutil/issues/655
@@ -1949,7 +1950,7 @@ class TestUnicode(unittest.TestCase):
psutil.disk_usage(path)
-@unittest.skipIf(TRAVIS, "fails on TRAVIS")
+@unittest.skipIf(OSX and TRAVIS, "fails on OSX + TRAVIS")
class TestNonUnicode(unittest.TestCase):
"""Test handling of non-utf8 data."""