[PATCH 3/4] Clean up mocking done by udev tests when finished.
David Lehman
dlehman at redhat.com
Thu Jul 31 22:16:21 UTC 2014
---
tests/udev_test.py | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/tests/udev_test.py b/tests/udev_test.py
index a930031..e3e817d 100644
--- a/tests/udev_test.py
+++ b/tests/udev_test.py
@@ -7,8 +7,18 @@ class UdevTest(unittest.TestCase):
def setUp(self):
import blivet.udev
+ self._blivet_os = blivet.udev.os
+ self._blivet_log = blivet.udev.log
+ self._blivet_util = blivet.udev.util
blivet.udev.os = mock.Mock()
blivet.udev.log = mock.Mock()
+ blivet.udev.util = mock.Mock()
+
+ def tearDown(self):
+ import blivet.udev
+ blivet.udev.log = self._blivet_log
+ blivet.udev.os = self._blivet_os
+ blivet.udev.util = self._blivet_util
def test_udev_get_device(self):
import blivet.udev
@@ -18,13 +28,11 @@ class UdevTest(unittest.TestCase):
def udev_settle_test(self):
import blivet.udev
- blivet.udev.util = mock.Mock()
blivet.udev.settle()
self.assertTrue(blivet.udev.util.run_program.called)
def udev_trigger_test(self):
import blivet.udev
- blivet.udev.util = mock.Mock()
blivet.udev.trigger()
self.assertTrue(blivet.udev.util.run_program.called)
--
1.9.3
More information about the anaconda-patches
mailing list