diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-01-26 18:43:19 +0100 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-01-26 18:43:19 +0100 |
| commit | 0684302e8e24dbebf536f4c8530475b21355f7c3 (patch) | |
| tree | 3e1579656d8d7525c2392b35411a709172463cfa | |
| parent | 109f873ea81b28c9f82142a556f75e68256dbaa5 (diff) | |
| parent | 783395e70b631201cf6a3c4f77ba0565f354300a (diff) | |
| download | psutil-0684302e8e24dbebf536f4c8530475b21355f7c3.tar.gz | |
Merge branch 'master' into 955-battery-sensors
| -rwxr-xr-x | psutil/tests/test_system.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/psutil/tests/test_system.py b/psutil/tests/test_system.py index 906641e4..cf33d140 100755 --- a/psutil/tests/test_system.py +++ b/psutil/tests/test_system.py @@ -709,9 +709,10 @@ class TestSystemAPIs(unittest.TestCase): self.assertGreaterEqual(value, 0) ls = psutil.cpu_freq(percpu=True) - if not TRAVIS: - assert ls, ls + if TRAVIS and not ls: + return + assert ls, ls check_ls([psutil.cpu_freq(percpu=False)]) if LINUX: |