action_test broken about blivet HOT 4 CLOSED

diff --git a/tests/storagetestcase.py b/tests/storagetestcase.py
index ad1216f..427a19c 100644
--- a/tests/storagetestcase.py
+++ b/tests/storagetestcase.py
@@ -69,6 +69,12 @@ class StorageTestCase(unittest.TestCase):
         self.partition_probe = PartitionDevice.probe
         PartitionDevice.probe = partition_probe

+        def nada():
+            pass
+
+        self.get_active_mounts = blivet.formats.fs.mountsCache._getActiveMounts
+        blivet.formats.fs.mountsCache._getActiveMounts = nada
+
     def tearDown(self):
         blivet.devices.StorageDevice.status = self.storage_status
         blivet.devices.DMDevice.status = self.dm_status
@@ -84,6 +90,8 @@ class StorageTestCase(unittest.TestCase):

         blivet.devices.PartitionDevice.probe = self.partition_probe

+        blivet.formats.fs.mountsCache._getActiveMounts = self.get_active_mounts
+
     def newDevice(self, *args, **kwargs):
         """ Return a new Device instance suitable for testing. """
         device_class = kwargs.pop("device_class")

diff --git a/tests/action_test.py b/tests/action_test.py
index 00d63ad..bafec96 100644
--- a/tests/action_test.py
+++ b/tests/action_test.py
@@ -34,7 +34,7 @@ class DeviceActionTestCase(StorageTestCase):
         """
         super(DeviceActionTestCase, self).setUp()

-        for name in ["sda", "sdb", "sdc", "sdd"]:
+        for name in ["mocksda", "mocksdb", "mocksdc", "mocksdd"]:
             disk = self.newDevice(device_class=DiskDevice,
                                   name=name, size=Size("100 GiB"))
             disk.format = self.newFormat("disklabel", path=disk.path,
@@ -42,11 +42,11 @@ class DeviceActionTestCase(StorageTestCase):
             self.storage.devicetree._addDevice(disk)

         # create a layout similar to autopart as a starting point
-        sda = self.storage.devicetree.getDeviceByName("sda")
-        sdb = self.storage.devicetree.getDeviceByName("sdb")
+        sda = self.storage.devicetree.getDeviceByName("mocksda")
+        sdb = self.storage.devicetree.getDeviceByName("mocksdb")

         sda1 = self.newDevice(device_class=PartitionDevice,
-                              exists=True, name="sda1", parents=[sda],
+                              exists=True, name="mocksda1", parents=[sda],
                               size=Size("500 MiB"))
         sda1.format = self.newFormat("ext4", mountpoint="/boot",
                                      device_instance=sda1,
@@ -54,13 +54,13 @@ class DeviceActionTestCase(StorageTestCase):
         self.storage.devicetree._addDevice(sda1)

         sda2 = self.newDevice(device_class=PartitionDevice,
-                              size=Size("99.5 GiB"), name="sda2",
+                              size=Size("99.5 GiB"), name="mocksda2",
                               parents=[sda], exists=True)
         sda2.format = self.newFormat("lvmpv", device=sda2.path, exists=True)
         self.storage.devicetree._addDevice(sda2)

         sdb1 = self.newDevice(device_class=PartitionDevice,
-                              size=Size("99.999 GiB"), name="sdb1",
+                              size=Size("99.999 GiB"), name="mocksdb1",
                               parents=[sdb], exists=True)
         sdb1.format = self.newFormat("lvmpv", device=sdb1.path, exists=True)
         self.storage.devicetree._addDevice(sdb1)