diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-04-23 21:05:22 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-04-23 21:05:22 +0200 |
| commit | 3ecc248a05cef8f62af572431dfe465c8ac0f3b4 (patch) | |
| tree | e79bce765cbe1cf15cf16dcef7b5286d4db16df3 | |
| parent | 2577bd234219422d845bb1bf7f1bc43966596eaa (diff) | |
| download | psutil-3ecc248a05cef8f62af572431dfe465c8ac0f3b4.tar.gz | |
fix travis failure
| -rwxr-xr-x | psutil/tests/test_linux.py | 2 | ||||
| -rwxr-xr-x | psutil/tests/test_process.py | 4 | ||||
| -rwxr-xr-x | psutil/tests/test_system.py | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py index 3ee2ee8b..74d4dc6f 100755 --- a/psutil/tests/test_linux.py +++ b/psutil/tests/test_linux.py @@ -1425,7 +1425,7 @@ class TestProcess(unittest.TestCase): # not sure why (doesn't fail locally) # https://travis-ci.org/giampaolo/psutil/jobs/108629915 - # @unittest.skipIf(TRAVIS, "unreliable on TRAVIS") + @unittest.skipIf(TRAVIS, "unreliable on TRAVIS") def test_exe_mocked(self): with mock.patch('psutil._pslinux.readlink', side_effect=OSError(errno.ENOENT, "")) as m: diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py index 2b4a6795..f6442a53 100755 --- a/psutil/tests/test_process.py +++ b/psutil/tests/test_process.py @@ -368,7 +368,6 @@ class TestProcess(unittest.TestCase): @unittest.skipUnless(LINUX or (WINDOWS and get_winver() >= WIN_VISTA), 'platform not supported') - # @unittest.skipIf(LINUX and TRAVIS, "unknown failure on travis") def test_ionice(self): if LINUX: from psutil import (IOPRIO_CLASS_NONE, IOPRIO_CLASS_RT, @@ -573,8 +572,6 @@ class TestProcess(unittest.TestCase): thread.stop() @retry_before_failing() - # see: https://travis-ci.org/giampaolo/psutil/jobs/111842553 - # @unittest.skipIf(OSX and TRAVIS, "fails on TRAVIS + OSX") @skip_on_access_denied(only_if=OSX) def test_threads_2(self): sproc = get_test_subprocess() @@ -879,7 +876,6 @@ class TestProcess(unittest.TestCase): call_until(p.cwd, "ret == os.path.dirname(os.getcwd())") @unittest.skipUnless(WINDOWS or LINUX or FREEBSD, 'platform not supported') - # @unittest.skipIf(LINUX and TRAVIS, "unreliable on TRAVIS") def test_cpu_affinity(self): p = psutil.Process() initial = p.cpu_affinity() diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py index 1ff79815..ff82f67e 100755 --- a/psutil/tests/test_system.py +++ b/psutil/tests/test_system.py @@ -438,7 +438,6 @@ class TestSystemAPIs(unittest.TestCase): os.mkdir(TESTFN_UNICODE) psutil.disk_usage(TESTFN_UNICODE) - # @unittest.skipIf(LINUX and TRAVIS, "unknown failure on travis") def test_disk_partitions(self): # all = False ls = psutil.disk_partitions(all=False) @@ -459,7 +458,7 @@ class TestSystemAPIs(unittest.TestCase): # we cannot make any assumption about this, see: # http://goo.gl/p9c43 disk.device - if SUNOS: + if SUNOS or TRAVIS: # on solaris apparently mount points can also be files assert os.path.exists(disk.mountpoint), disk else: |