summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2021-01-07 15:02:23 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2021-01-07 15:02:23 +0100
commit149eda5dfe1c9f8a5893a27b33509690f575b881 (patch)
treea2637b685c66e8a667696cf895b58e6e30c32395
parent05d3cac2a575eaa18fbe9038625b842125e7dfdc (diff)
downloadpsutil-cpu-freq-sparc.tar.gz
update testscpu-freq-sparc
Signed-off-by: Giampaolo Rodola <g.rodola@gmail.com>
-rwxr-xr-xpsutil/tests/test_linux.py30
1 files changed, 13 insertions, 17 deletions
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
index fa82ed5b..96a2c826 100755
--- a/psutil/tests/test_linux.py
+++ b/psutil/tests/test_linux.py
@@ -848,19 +848,17 @@ class TestSystemCPUFrequency(PsutilTestCase):
patch_point = 'builtins.open' if PY3 else '__builtin__.open'
with mock.patch(patch_point, side_effect=open_mock):
with mock.patch('os.path.exists', return_value=True):
- with mock.patch('psutil._pslinux.cpu_count_logical',
- return_value=2):
- freq = psutil.cpu_freq(percpu=True)
- self.assertEqual(freq[0].current, 100.0)
- if freq[0].min != 0.0:
- self.assertEqual(freq[0].min, 200.0)
- if freq[0].max != 0.0:
- self.assertEqual(freq[0].max, 300.0)
- self.assertEqual(freq[1].current, 400.0)
- if freq[1].min != 0.0:
- self.assertEqual(freq[1].min, 500.0)
- if freq[1].max != 0.0:
- self.assertEqual(freq[1].max, 600.0)
+ freq = psutil.cpu_freq(percpu=True)
+ self.assertEqual(freq[0].current, 100.0)
+ if freq[0].min != 0.0:
+ self.assertEqual(freq[0].min, 200.0)
+ if freq[0].max != 0.0:
+ self.assertEqual(freq[0].max, 300.0)
+ self.assertEqual(freq[1].current, 400.0)
+ if freq[1].min != 0.0:
+ self.assertEqual(freq[1].min, 500.0)
+ if freq[1].max != 0.0:
+ self.assertEqual(freq[1].max, 600.0)
@unittest.skipIf(not HAS_CPU_FREQ, "not supported")
def test_emulate_no_scaling_cur_freq_file(self):
@@ -879,10 +877,8 @@ class TestSystemCPUFrequency(PsutilTestCase):
patch_point = 'builtins.open' if PY3 else '__builtin__.open'
with mock.patch(patch_point, side_effect=open_mock):
with mock.patch('os.path.exists', return_value=True):
- with mock.patch('psutil._pslinux.cpu_count_logical',
- return_value=1):
- freq = psutil.cpu_freq()
- self.assertEqual(freq.current, 200)
+ freq = psutil.cpu_freq()
+ self.assertEqual(freq.current, 200)
@unittest.skipIf(not HAS_CPU_FREQ, "not supported")
def test_emulate_sparc(self):