diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-04-23 20:49:42 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-04-23 20:49:42 +0200 |
| commit | 2577bd234219422d845bb1bf7f1bc43966596eaa (patch) | |
| tree | cdb8ac4c05309a4bb7a94767e69e76b9448583c4 | |
| parent | fc66da427cb176355d9d7a2d34796ecdff5dc870 (diff) | |
| download | psutil-2577bd234219422d845bb1bf7f1bc43966596eaa.tar.gz | |
try to re-enable some travis testst
| -rwxr-xr-x | psutil/tests/test_linux.py | 4 | ||||
| -rwxr-xr-x | psutil/tests/test_process.py | 6 | ||||
| -rwxr-xr-x | psutil/tests/test_system.py | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py index 01ac9357..3ee2ee8b 100755 --- a/psutil/tests/test_linux.py +++ b/psutil/tests/test_linux.py @@ -1425,9 +1425,9 @@ 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.os.readlink', + with mock.patch('psutil._pslinux.readlink', side_effect=OSError(errno.ENOENT, "")) as m: # No such file error; might be raised also if /proc/pid/exe # path actually exists for system processes with low pids diff --git a/psutil/tests/test_process.py b/psutil/tests/test_process.py index 8b8006da..2b4a6795 100755 --- a/psutil/tests/test_process.py +++ b/psutil/tests/test_process.py @@ -368,7 +368,7 @@ 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") + # @unittest.skipIf(LINUX and TRAVIS, "unknown failure on travis") def test_ionice(self): if LINUX: from psutil import (IOPRIO_CLASS_NONE, IOPRIO_CLASS_RT, @@ -574,7 +574,7 @@ class TestProcess(unittest.TestCase): @retry_before_failing() # see: https://travis-ci.org/giampaolo/psutil/jobs/111842553 - @unittest.skipIf(OSX and TRAVIS, "fails on TRAVIS + OSX") + # @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 +879,7 @@ 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") + # @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 79e217d4..1ff79815 100755 --- a/psutil/tests/test_system.py +++ b/psutil/tests/test_system.py @@ -438,7 +438,7 @@ class TestSystemAPIs(unittest.TestCase): os.mkdir(TESTFN_UNICODE) psutil.disk_usage(TESTFN_UNICODE) - @unittest.skipIf(LINUX and TRAVIS, "unknown failure on travis") + # @unittest.skipIf(LINUX and TRAVIS, "unknown failure on travis") def test_disk_partitions(self): # all = False ls = psutil.disk_partitions(all=False) |