Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

skip cpu_freq tests if not available #1170

Merged
merged 1 commit into from
Nov 11, 2017
Merged

skip cpu_freq tests if not available #1170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion psutil/tests/test_contracts.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,10 @@ def test_linux_rlimit(self):
ae(hasattr(psutil, "RLIMIT_SIGPENDING"), hasit)

def test_cpu_freq(self):
self.assertEqual(hasattr(psutil, "cpu_freq"), LINUX or OSX or WINDOWS)
linux = (LINUX and
(os.path.exists("/sys/devices/system/cpu/cpufreq") or
os.path.exists("/sys/devices/system/cpu/cpu0/cpufreq")))
self.assertEqual(hasattr(psutil, "cpu_freq"), linux or OSX or WINDOWS)

def test_sensors_temperatures(self):
self.assertEqual(hasattr(psutil, "sensors_temperatures"), LINUX)
Expand Down
6 changes: 6 additions & 0 deletions psutil/tests/test_linux.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
from psutil._compat import u
from psutil.tests import call_until
from psutil.tests import HAS_BATTERY
from psutil.tests import HAS_CPU_FREQ
from psutil.tests import HAS_RLIMIT
from psutil.tests import MEMORY_TOLERANCE
from psutil.tests import mock
Expand Down Expand Up @@ -607,11 +608,13 @@ def test_cpu_count_physical_mocked(self):
self.assertIsNone(psutil._pslinux.cpu_count_physical())
assert m.called

@unittest.skipIf(not HAS_CPU_FREQ, "not supported")
def test_cpu_freq_no_result(self):
with mock.patch("psutil._pslinux.glob.glob", return_value=[]):
self.assertIsNone(psutil.cpu_freq())

@unittest.skipIf(TRAVIS, "fails on Travis")
@unittest.skipIf(not HAS_CPU_FREQ, "not supported")
def test_cpu_freq_use_second_file(self):
# https://github.com/giampaolo/psutil/issues/981
def glob_mock(pattern):
Expand All @@ -629,6 +632,7 @@ def glob_mock(pattern):
assert psutil.cpu_freq()
self.assertEqual(len(flags), 2)

@unittest.skipIf(not HAS_CPU_FREQ, "not supported")
def test_cpu_freq_emulate_data(self):
def open_mock(name, *args, **kwargs):
if name.endswith('/scaling_cur_freq'):
Expand All @@ -651,6 +655,7 @@ def open_mock(name, *args, **kwargs):
self.assertEqual(freq.min, 600.0)
self.assertEqual(freq.max, 700.0)

@unittest.skipIf(not HAS_CPU_FREQ, "not supported")
def test_cpu_freq_emulate_multi_cpu(self):
def open_mock(name, *args, **kwargs):
if name.endswith('/scaling_cur_freq'):
Expand All @@ -675,6 +680,7 @@ def open_mock(name, *args, **kwargs):
self.assertEqual(freq.max, 300.0)

@unittest.skipIf(TRAVIS, "fails on Travis")
@unittest.skipIf(not HAS_CPU_FREQ, "not supported")
def test_cpu_freq_no_scaling_cur_freq_file(self):
# See: https://github.com/giampaolo/psutil/issues/1071
def open_mock(name, *args, **kwargs):
Expand Down