diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2016-11-25 22:46:45 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2016-11-25 22:46:45 +0100 |
commit | d7aed98564993694d55d95a0b034fcb62afafaea (patch) | |
tree | 2240907a7baf3d01b8b607b047b3055e21b34862 | |
parent | be81f1d48c46b0b149fbb7b1f977de8896e9be08 (diff) | |
parent | fb9bd7f445081b024c7a1c7dfab8949d2e6496fb (diff) | |
download | psutil-d7aed98564993694d55d95a0b034fcb62afafaea.tar.gz |
Merge branch 'master' into 357-proc-cpu-num
-rwxr-xr-x | psutil/tests/test_linux.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py index fe2f0810..d063fb40 100755 --- a/psutil/tests/test_linux.py +++ b/psutil/tests/test_linux.py @@ -534,6 +534,7 @@ class TestSystemCPUStats(unittest.TestCase): psutil_value = psutil.cpu_stats().ctx_switches self.assertAlmostEqual(vmstat_value, psutil_value, delta=500) + @unittest.skipIf(TRAVIS, "fails on Travis") def test_interrupts(self): vmstat_value = vmstat("interrupts") psutil_value = psutil.cpu_stats().interrupts |