[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH f15-branch master 2/2] Fixup upgrade test for findExistingRoots change (#681267)



Change to using findExistingRootDevices and remove
find_existing_roots_test which no longer tests anything.
---
 tests/pyanaconda_test/upgrade_test.py |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/tests/pyanaconda_test/upgrade_test.py b/tests/pyanaconda_test/upgrade_test.py
index 2f78546..3c849ec 100644
--- a/tests/pyanaconda_test/upgrade_test.py
+++ b/tests/pyanaconda_test/upgrade_test.py
@@ -68,7 +68,7 @@ class UpgradeTest(mock.TestCase):
     def find_root_parts_1_test(self):
         import pyanaconda.upgrade
         pyanaconda.upgrade.flags = mock.Mock()
-        pyanaconda.upgrade.findExistingRoots = mock.Mock(
+        pyanaconda.upgrade.findExistingRootDevices = mock.Mock(
                             return_value=(None, [("info1", "info2", "info3")]))
         pyanaconda.upgrade.setUpgradeRoot = mock.Mock()
         
@@ -96,12 +96,6 @@ class UpgradeTest(mock.TestCase):
         self.assertEqual(anaconda.dispatch.skipStep.call_args,
             (('findinstall',), {'skip': 0}))
     
-    def find_existing_roots_test(self):
-        import pyanaconda.upgrade
-        pyanaconda.upgrade.findExistingRootDevices = mock.Mock()
-        pyanaconda.upgrade.findExistingRoots(mock.Mock())
-        self.assertTrue(pyanaconda.upgrade.findExistingRootDevices.called)
-    
     def bind_mount_dev_directory_test(self):
         import pyanaconda.upgrade
         pyanaconda.upgrade.getFormat = mock.Mock()
-- 
1.7.4


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]