From 4aede2163f154b879f38a0c38cc7aa83d2b8a9a58c35ca86757cece09677ab84 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Fri, 21 Aug 2020 15:34:45 +0000 Subject: [PATCH] Fix skipUnless syntax OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-psutil?expand=0&rev=118 --- skip_failing_tests.patch | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/skip_failing_tests.patch b/skip_failing_tests.patch index b6adb74..88a2f51 100644 --- a/skip_failing_tests.patch +++ b/skip_failing_tests.patch @@ -1,26 +1,29 @@ --- a/psutil/tests/test_linux.py +++ b/psutil/tests/test_linux.py -@@ -1500,6 +1500,7 @@ class TestSensorsBattery(unittest.TestCa +@@ -1500,6 +1500,8 @@ class TestSensorsBattery(unittest.TestCa self.assertIsNone(psutil.sensors_battery().power_plugged) assert m.called -+ @unittest.skipUnless(os.path.exists('/sys/class/power_supply/BAT0/energy_now')) ++ @unittest.skipUnless(os.path.exists('/sys/class/power_supply/BAT0/energy_now'), ++ 'Missing /sys/class/power_supply/BAT0/energy_now file.') def test_emulate_no_base_files(self): # Emulate a case where base metrics files are not present, # in which case we're supposed to get None. -@@ -1511,6 +1512,7 @@ class TestSensorsBattery(unittest.TestCa +@@ -1511,6 +1513,8 @@ class TestSensorsBattery(unittest.TestCa IOError(errno.ENOENT, "")): self.assertIsNone(psutil.sensors_battery()) -+ @unittest.skipUnless(os.path.exists('/sys/class/power_supply/BAT0/energy_full')) ++ @unittest.skipUnless(os.path.exists('/sys/class/power_supply/BAT0/energy_full'), ++ 'Missing /sys/class/power_supply/BAT0/energy_full file.') def test_emulate_energy_full_0(self): # Emulate a case where energy_full files returns 0. with mock_open_content( -@@ -1518,6 +1520,7 @@ class TestSensorsBattery(unittest.TestCa +@@ -1518,6 +1522,8 @@ class TestSensorsBattery(unittest.TestCa self.assertEqual(psutil.sensors_battery().percent, 0) assert m.called -+ @unittest.skipUnless(os.path.exists('/sys/class/power_supply/BAT0/energy_full')) ++ @unittest.skipUnless(os.path.exists('/sys/class/power_supply/BAT0/energy_full'), ++ 'Missing /sys/class/power_supply/BAT0/energy_full file.') def test_emulate_energy_full_not_avail(self): # Emulate a case where energy_full file does not exist. # Expected fallback on /capacity.