---
tests/pyanaconda_test/upgrade_test.py | 92 ++++++++++++++++----------------
1 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/tests/pyanaconda_test/upgrade_test.py b/tests/pyanaconda_test/upgrade_test.py
index 2cca62f..6c006a7 100644
--- a/tests/pyanaconda_test/upgrade_test.py
+++ b/tests/pyanaconda_test/upgrade_test.py
@@ -3,32 +3,32 @@
import mock
class UpgradeTest(mock.TestCase):
-
+
def setUp(self):
self.setupModules(['_isys', 'block', 'parted', 'storage',
'pyanaconda.storage.formats', 'logging',
'ConfigParser'])
-
+
self.fs = mock.DiskIO()
-
+
import pyanaconda
pyanaconda.anaconda_log = mock.Mock()
-
+
import pyanaconda.upgrade
-
+
def tearDown(self):
self.tearDownModules()
-
+
def query_upgrade_continue_1_test(self):
import pyanaconda.upgrade
DIR = 1
pyanaconda.upgrade.DISPATCH_FORWARD
anaconda = mock.Mock()
anaconda.dir = DIR
-
+
ret = pyanaconda.upgrade.queryUpgradeContinue(anaconda)
self.assertEqual(None, ret)
-
+
def query_upgrade_continue_2_test(self):
import pyanaconda.upgrade
DIR = 1
@@ -36,10 +36,10 @@ class UpgradeTest(mock.TestCase):
anaconda = mock.Mock()
anaconda.dir = DIR - 5
anaconda.intf.messageWindow.return_value = 1
-
+
ret = pyanaconda.upgrade.queryUpgradeContinue(anaconda)
self.assertEqual(DIR, ret)
-
+
def set_upgrade_root_1_test(self):
import pyanaconda.upgrade
DEV_NAME = 'device'
@@ -49,7 +49,7 @@ class UpgradeTest(mock.TestCase):
anaconda.rootParts = [(DEV, DEV_NAME)]
pyanaconda.upgrade.setUpgradeRoot(anaconda)
self.assertEqual(1, len(anaconda.upgradeRoot))
-
+
def set_upgrade_root_2_test(self):
import pyanaconda.upgrade
DEV_NAME = 'device'
@@ -58,44 +58,44 @@ class UpgradeTest(mock.TestCase):
DEV2_NAME = 'device2'
DEV2 = mock.Mock()
DEV2.name = DEV2_NAME
-
+
anaconda = mock.Mock()
anaconda.ksdata.upgrade.root_device = DEV2_NAME
anaconda.rootParts = [(DEV, DEV_NAME), (DEV2, DEV2_NAME)]
pyanaconda.upgrade.setUpgradeRoot(anaconda)
self.assertEqual(anaconda.upgradeRoot[0][1], DEV2_NAME)
-
+
def find_root_parts_1_test(self):
import pyanaconda.upgrade
pyanaconda.upgrade.flags = mock.Mock()
pyanaconda.upgrade.findExistingRootDevices = mock.Mock(
return_value=(None, [("info1", "info2", "info3")]))
pyanaconda.upgrade.setUpgradeRoot = mock.Mock()
-
+
anaconda = mock.Mock()
- anaconda.dir = pyanaconda.upgrade.DISPATCH_BACK + 2
+ anaconda.dir = pyanaconda.upgrade.DISPATCH_DEFAULT
anaconda.rootParts = None
anaconda.intf.messageWindow.return_value = 1
-
+
pyanaconda.upgrade.findRootParts(anaconda)
self.assertTrue(anaconda.intf.messageWindow.called)
- self.assertEqual(anaconda.dispatch.skip_steps.call_args,
- (('findinstall',), {'skip': 1}))
-
+ self.assertEqual(anaconda.dispatch.skip_steps.call_args[0],
+ ('findinstall',))
+
def find_root_parts_2_test(self):
import pyanaconda.upgrade
pyanaconda.upgrade.setUpgradeRoot = mock.Mock()
-
+
anaconda = mock.Mock()
- anaconda.dir = pyanaconda.upgrade.DISPATCH_BACK + 2
+ anaconda.dir = pyanaconda.upgrade.DISPATCH_DEFAULT
anaconda.rootParts = ['rootpart']
anaconda.intf.messageWindow.return_value = 1
-
+
pyanaconda.upgrade.findRootParts(anaconda)
self.assertFalse(anaconda.intf.messageWindow.called)
- self.assertEqual(anaconda.dispatch.skip_steps.call_args,
- (('findinstall',), {'skip': 0}))
-
+ self.assertEqual(anaconda.dispatch.request_steps.call_args[0],
+ ('findinstall',))
+
def bind_mount_dev_directory_test(self):
import pyanaconda.upgrade
pyanaconda.upgrade.getFormat = mock.Mock()
@@ -103,7 +103,7 @@ class UpgradeTest(mock.TestCase):
pyanaconda.upgrade.bindMountDevDirectory(INST_PATH)
self.assertEqual(pyanaconda.upgrade.getFormat().mount.call_args,
((), {'chroot': INST_PATH}))
-
+
def upgrade_migrate_find_1_test(self):
import pyanaconda.upgrade
anaconda = mock.Mock()
@@ -111,15 +111,15 @@ class UpgradeTest(mock.TestCase):
pyanaconda.upgrade.upgradeMigrateFind(anaconda)
self.assertEqual(anaconda.dispatch.skip_steps.call_args,
(('upgrademigratefs',), {}))
-
+
def upgrade_migrate_find_2_test(self):
import pyanaconda.upgrade
anaconda = mock.Mock()
anaconda.storage.migratableDevices = ['']
pyanaconda.upgrade.upgradeMigrateFind(anaconda)
- self.assertEqual(anaconda.dispatch.skip_steps.call_args,
- (('upgrademigratefs',), {'skip': 0}))
-
+ self.assertEqual(anaconda.dispatch.request_steps.call_args[0],
+ ('upgrademigratefs',))
+
def copy_from_sysimage_1_test(self):
import pyanaconda.upgrade
pyanaconda.upgrade.os = mock.Mock()
@@ -128,7 +128,7 @@ class UpgradeTest(mock.TestCase):
FILE = "file"
ret = pyanaconda.upgrade.copyFromSysimage(ROOT, FILE)
self.assertFalse(ret)
-
+
def copy_from_sysimage_2_test(self):
import pyanaconda.upgrade
pyanaconda.upgrade.os = mock.Mock()
@@ -141,7 +141,7 @@ class UpgradeTest(mock.TestCase):
self.assertTrue(pyanaconda.upgrade.os.remove.called)
self.assertTrue(pyanaconda.upgrade.shutil.copyfile.called)
self.assertFalse(ret)
-
+
def copy_from_sysimage_3_test(self):
import pyanaconda.upgrade
pyanaconda.upgrade.os = mock.Mock()
@@ -153,7 +153,7 @@ class UpgradeTest(mock.TestCase):
self.assertTrue(pyanaconda.upgrade.os.remove.called)
self.assertTrue(pyanaconda.upgrade.shutil.copyfile.called)
self.assertTrue(ret)
-
+
def restore_time_1_test(self):
import pyanaconda.upgrade
pyanaconda.upgrade.os = mock.Mock()
@@ -162,7 +162,7 @@ class UpgradeTest(mock.TestCase):
anaconda.dir = pyanaconda.upgrade.DISPATCH_BACK
pyanaconda.upgrade.restoreTime(anaconda)
self.assertTrue(pyanaconda.upgrade.os.environ.has_key('TZ'))
-
+
def restore_time_2_test(self):
import pyanaconda.upgrade
pyanaconda.upgrade.copyFromSysimage = mock.Mock()
@@ -170,14 +170,14 @@ class UpgradeTest(mock.TestCase):
pyanaconda.upgrade.os.environ = {'TZ': 'foo'}
pyanaconda.upgrade.iutil = mock.Mock()
pyanaconda.upgrade.iutil.isS390.return_value = True
-
+
anaconda = mock.Mock()
anaconda.dir = pyanaconda.upgrade.DISPATCH_BACK + 1
pyanaconda.upgrade.restoreTime(anaconda)
self.assertFalse(pyanaconda.upgrade.os.environ.has_key('TZ'))
self.assertTrue(pyanaconda.upgrade.copyFromSysimage.called)
self.assertFalse(pyanaconda.upgrade.iutil.execWithRedirect.called)
-
+
def restore_time_3_test(self):
import pyanaconda.upgrade
pyanaconda.upgrade.copyFromSysimage = mock.Mock()
@@ -185,14 +185,14 @@ class UpgradeTest(mock.TestCase):
pyanaconda.upgrade.os.environ = {'TZ': 'foo'}
pyanaconda.upgrade.iutil = mock.Mock()
pyanaconda.upgrade.iutil.isS390.return_value = False
-
+
anaconda = mock.Mock()
anaconda.dir = pyanaconda.upgrade.DISPATCH_BACK + 1
pyanaconda.upgrade.restoreTime(anaconda)
self.assertFalse(pyanaconda.upgrade.os.environ.has_key('TZ'))
self.assertTrue(pyanaconda.upgrade.copyFromSysimage.called)
self.assertTrue(pyanaconda.upgrade.iutil.execWithRedirect.called)
-
+
def upgrade_mount_filesystems_1_test(self):
import pyanaconda.upgrade
pyanaconda.upgrade.mountExistingSystem = mock.Mock()
@@ -200,14 +200,14 @@ class UpgradeTest(mock.TestCase):
pyanaconda.upgrade.os.islink.return_value = True
pyanaconda.upgrade.os.readlink.return_value = 'a'
pyanaconda.upgrade.os.path.exists.return_value = False
-
+
anaconda = mock.Mock()
anaconda.upgradeRoot = ['']
anaconda.rootPath = ''
pyanaconda.upgrade.upgradeMountFilesystems(anaconda)
self.assertTrue(anaconda.storage.turnOnSwap.called)
self.assertTrue(anaconda.storage.mkDevRoot.called)
-
+
def upgrade_mount_filesystems_2_test(self):
# This test include parts:
# moving /etc/rpm/platform out of the way
@@ -221,7 +221,7 @@ class UpgradeTest(mock.TestCase):
pyanaconda.upgrade.shutil = mock.Mock()
pyanaconda.upgrade.selinux = mock.Mock()
pyanaconda.upgrade.flags = mock.Mock()
-
+
anaconda = mock.Mock()
anaconda.upgradeRoot = ['']
anaconda.rootPath = ''
@@ -231,14 +231,14 @@ class UpgradeTest(mock.TestCase):
self.assertEqual(pyanaconda.upgrade.shutil.move.call_args,
(("/etc/rpm/platform", "/etc/rpm/platform.rpmsave"), {}))
self.assertTrue(pyanaconda.upgrade.selinux.getfilecon.called)
-
+
def set_steps_test(self):
import pyanaconda.upgrade
pyanaconda.upgrade.iutil = mock.Mock()
pyanaconda.upgrade.iutil.isX86.return_value = False
-
+ pyanaconda.upgrade.iutil.isS390.return_value = False
+
anaconda = mock.Mock()
pyanaconda.upgrade.setSteps(anaconda)
- self.assertEqual(anaconda.dispatch.skip_steps.call_args_list,
- [(('bootloader',), {}), (('upgbootloader',), {})])
-
+ self.assertEqual(zip(*anaconda.dispatch.skip_steps.call_args_list)[0],
+ (('bootloader',), ('upgbootloader',), ('cleardiskssel',)))
--
1.7.3.3
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
