summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2015-01-06 16:29:04 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2015-01-06 16:29:04 +0100
commitd5d3fd493640959977aec0a8e99a821ea65c712d (patch)
tree7c8aabdd15557b920485c332d7d4be2e0fd8e813
parent97fba78f6b8bf39176ea98188f668f761b1d1281 (diff)
downloadpsutil-d5d3fd493640959977aec0a8e99a821ea65c712d.tar.gz
attempt to fix travis failure
-rw-r--r--test/test_memory_leaks.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/test_memory_leaks.py b/test/test_memory_leaks.py
index 7119a515..be346269 100644
--- a/test/test_memory_leaks.py
+++ b/test/test_memory_leaks.py
@@ -27,7 +27,7 @@ import psutil._common
from psutil._compat import xrange
from test_psutil import (WINDOWS, POSIX, OSX, LINUX, SUNOS, BSD, TESTFN,
- RLIMIT_SUPPORT)
+ RLIMIT_SUPPORT, TRAVIS)
from test_psutil import (reap_children, supports_ipv6, safe_remove,
get_test_subprocess)
@@ -234,7 +234,8 @@ class TestProcessObjectLeaks(Base):
def test_cpu_affinity_set(self):
affinity = psutil.Process().cpu_affinity()
self.execute('cpu_affinity', affinity)
- self.execute_w_exc(ValueError, 'cpu_affinity', [-1])
+ if not TRAVIS:
+ self.execute_w_exc(ValueError, 'cpu_affinity', [-1])
@skip_if_linux()
def test_open_files(self):