summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-03-24 16:19:51 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2017-03-24 16:19:51 +0100
commit2ab6417338cfa4b674a2e39c7592b265f3cadc80 (patch)
tree9dc40d22cae22f299f1466f7cdd09faf3a99bc65
parentad91a2e60838443c9d5efbe93eba3baf8b609cb2 (diff)
downloadpsutil-release-5.2.1.tar.gz
fix travis failurerelease-5.2.1
-rwxr-xr-xpsutil/tests/test_linux.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
index a28644d4..183f5cda 100755
--- a/psutil/tests/test_linux.py
+++ b/psutil/tests/test_linux.py
@@ -541,6 +541,7 @@ class TestSystemCPU(unittest.TestCase):
with mock.patch("psutil._pslinux.glob.glob", return_value=[]):
self.assertIsNone(psutil.cpu_freq())
+ @unittest.skipIf(TRAVIS, "fails on Travis")
def test_cpu_freq_use_second_file(self):
# https://github.com/giampaolo/psutil/issues/981
def glob_mock(pattern):
@@ -555,8 +556,7 @@ class TestSystemCPU(unittest.TestCase):
orig_glob = glob.glob
with mock.patch("psutil._pslinux.glob.glob", side_effect=glob_mock,
create=True):
- if not TRAVIS:
- assert psutil.cpu_freq()
+ assert psutil.cpu_freq()
self.assertEqual(len(flags), 2)