core: fix unit tests

core/tests/test_trezor.io.fatfs.py

@@ -6,15 +6,14 @@ from trezor import io
 class TestTrezorIoFatfs(unittest.TestCase):
 
     def setUp(self):
-        self.sd = io.SDCard()
-        self.sd.power(True)
+        io.sdcard.power_on()
         self.fs = io.FatFS()
         self.fs.mkfs()
         self.fs.mount()
 
     def tearDown(self):
         self.fs.unmount()
-        self.sd.power(False)
+        io.sdcard.power_off()
 
     def _filename(self, suffix=""):
         return "FILE%s.TXT" % suffix

core/tests/test_trezor.io.sdcard.py

@@ -6,45 +6,41 @@ from trezor import io
 class TestTrezorIoSdcard(unittest.TestCase):
 
     def test_start(self):
-        sd = io.SDCard()
-        self.assertTrue(sd.present())
+        self.assertTrue(io.sdcard.is_present())
 
     def test_power(self):
-        sd = io.SDCard()
         x = bytearray(8 * 512)
-        self.assertEqual(sd.capacity(), 0)
+        self.assertEqual(io.sdcard.capacity(), 0)
         with self.assertRaises(OSError):
-            sd.read(0, x)
-        sd.power(True)
-        self.assertTrue(sd.capacity() > 0)
-        sd.read(0, x)
-        sd.power(False)
-        self.assertEqual(sd.capacity(), 0)
+            io.sdcard.read(0, x)
+        io.sdcard.power_on()
+        self.assertTrue(io.sdcard.capacity() > 0)
+        io.sdcard.read(0, x)
+        io.sdcard.power_off()
+        self.assertEqual(io.sdcard.capacity(), 0)
         with self.assertRaises(OSError):
-            sd.read(0, x)
+            io.sdcard.read(0, x)
 
     def test_read(self):
-        sd = io.SDCard()
         x = bytearray(8 * 512)
-        sd.power(True)
-        sd.read(0, x)
-        sd.power(False)
+        io.sdcard.power_on()
+        io.sdcard.read(0, x)
+        io.sdcard.power_off()
         with self.assertRaises(OSError):
-            sd.read(0, x)
+            io.sdcard.read(0, x)
 
     def test_read_write(self):
-        sd = io.SDCard()
         r = bytearray(8 * 512)
         w0 = bytearray(b'0' * (8 * 512))
         w1 = bytearray(b'1' * (8 * 512))
-        sd.power(True)
-        sd.write(0, w0)
-        sd.read(0, r)
+        io.sdcard.power_on()
+        io.sdcard.write(0, w0)
+        io.sdcard.read(0, r)
         self.assertEqual(r, w0)
-        sd.write(0, w1)
-        sd.read(0, r)
+        io.sdcard.write(0, w1)
+        io.sdcard.read(0, r)
         self.assertEqual(r, w1)
-        sd.power(False)
+        io.sdcard.power_off()
 
 
 if __name__ == '__main__':