matzman/hddfancontrol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve hdparm error handling - 3

Browse Source
This commit is contained in:
desbma
2017-02-25 14:03:51 +01:00
parent 820034f711
commit 9bbd7ce508
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hddfancontrol/__init__.py
+1
View File
@@ -97,6 +97,7 @@ class Drive:
try: try:
output = subprocess.check_output(cmd, output = subprocess.check_output(cmd,
stdin=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
stderr=subprocess.STDOUT,
universal_newlines=True) universal_newlines=True)
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
supported = False supported = False
tests/__init__.py
+4
View File
@@ -66,24 +66,28 @@ class TestDrive(unittest.TestCase):
self.assertEqual(self.drive.supportsHitachiTempQuery(), True) self.assertEqual(self.drive.supportsHitachiTempQuery(), True)
subprocess_check_output_mock.assert_called_once_with(("hdparm", "-H", "/dev/sdz"), subprocess_check_output_mock.assert_called_once_with(("hdparm", "-H", "/dev/sdz"),
stdin=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
stderr=subprocess.STDOUT,
universal_newlines=True) universal_newlines=True)
with unittest.mock.patch("hddfancontrol.subprocess.check_output") as subprocess_check_output_mock: with unittest.mock.patch("hddfancontrol.subprocess.check_output") as subprocess_check_output_mock:
subprocess_check_output_mock.return_value = "\n/dev/sdz:\nSG_IO: questionable sense data, results may be incorrect\n drive temperature (celsius) is: -18\n drive temperature in range: yes" subprocess_check_output_mock.return_value = "\n/dev/sdz:\nSG_IO: questionable sense data, results may be incorrect\n drive temperature (celsius) is: -18\n drive temperature in range: yes"
self.assertEqual(self.drive.supportsHitachiTempQuery(), False) self.assertEqual(self.drive.supportsHitachiTempQuery(), False)
subprocess_check_output_mock.assert_called_once_with(("hdparm", "-H", "/dev/sdz"), subprocess_check_output_mock.assert_called_once_with(("hdparm", "-H", "/dev/sdz"),
stdin=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
stderr=subprocess.STDOUT,
universal_newlines=True) universal_newlines=True)
with unittest.mock.patch("hddfancontrol.subprocess.check_output") as subprocess_check_output_mock: with unittest.mock.patch("hddfancontrol.subprocess.check_output") as subprocess_check_output_mock:
subprocess_check_output_mock.return_value = "\n/dev/sdz:\nSG_IO: missing sense data, results may be incorrect\n drive temperature (celsius) is: -18\n drive temperature in range: yes" subprocess_check_output_mock.return_value = "\n/dev/sdz:\nSG_IO: missing sense data, results may be incorrect\n drive temperature (celsius) is: -18\n drive temperature in range: yes"
self.assertEqual(self.drive.supportsHitachiTempQuery(), False) self.assertEqual(self.drive.supportsHitachiTempQuery(), False)
subprocess_check_output_mock.assert_called_once_with(("hdparm", "-H", "/dev/sdz"), subprocess_check_output_mock.assert_called_once_with(("hdparm", "-H", "/dev/sdz"),
stdin=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
stderr=subprocess.STDOUT,
universal_newlines=True) universal_newlines=True)
with unittest.mock.patch("hddfancontrol.subprocess.check_output") as subprocess_check_output_mock: with unittest.mock.patch("hddfancontrol.subprocess.check_output") as subprocess_check_output_mock:
subprocess_check_output_mock.return_value = "\n/dev/sdz:\nSG_IO: bad/missing sense data, sb[]: 70 00 05 00 00 00 00 0a 04 51 40 00 21 04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00\n drive temperature (celsius) is: -18\n drive temperature in range: yes" subprocess_check_output_mock.return_value = "\n/dev/sdz:\nSG_IO: bad/missing sense data, sb[]: 70 00 05 00 00 00 00 0a 04 51 40 00 21 04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00\n drive temperature (celsius) is: -18\n drive temperature in range: yes"
self.assertEqual(self.drive.supportsHitachiTempQuery(), False) self.assertEqual(self.drive.supportsHitachiTempQuery(), False)
subprocess_check_output_mock.assert_called_once_with(("hdparm", "-H", "/dev/sdz"), subprocess_check_output_mock.assert_called_once_with(("hdparm", "-H", "/dev/sdz"),
stdin=subprocess.DEVNULL, stdin=subprocess.DEVNULL,
stderr=subprocess.STDOUT,
universal_newlines=True) universal_newlines=True)
def test_getState(self): def test_getState(self):