|
@@ -4,6 +4,7 @@
|
|
|
import logging
|
|
import logging
|
|
|
from unittest import mock
|
|
from unittest import mock
|
|
|
|
|
|
|
|
|
|
+from coriolis import exception
|
|
|
from coriolis.osmorphing.osmount import windows
|
|
from coriolis.osmorphing.osmount import windows
|
|
|
from coriolis.tests import test_base
|
|
from coriolis.tests import test_base
|
|
|
|
|
|
|
@@ -271,8 +272,7 @@ class WindowsMountToolsTestCase(test_base.CoriolisBaseTestCase):
|
|
|
bring_disks_offline_mock.assert_called()
|
|
bring_disks_offline_mock.assert_called()
|
|
|
bring_disks_online_mock.assert_called()
|
|
bring_disks_online_mock.assert_called()
|
|
|
|
|
|
|
|
- @mock.patch.object(windows.WindowsMountTools, '_rebring_disks_online')
|
|
|
|
|
- def test__set_volumes_drive_letter(self, rebring_disks_mock):
|
|
|
|
|
|
|
+ def test__set_volumes_drive_letter(self):
|
|
|
self.tools._conn.exec_ps_command.return_value = GET_PARTITION_OUTPUT
|
|
self.tools._conn.exec_ps_command.return_value = GET_PARTITION_OUTPUT
|
|
|
result = self.tools._set_volumes_drive_letter()
|
|
result = self.tools._set_volumes_drive_letter()
|
|
|
self.assertIsNone(result)
|
|
self.assertIsNone(result)
|
|
@@ -289,7 +289,13 @@ class WindowsMountToolsTestCase(test_base.CoriolisBaseTestCase):
|
|
|
'Set-Partition -NoDefaultDriveLetter $False -DiskNumber 3 '
|
|
'Set-Partition -NoDefaultDriveLetter $False -DiskNumber 3 '
|
|
|
'-PartitionNumber 4'),
|
|
'-PartitionNumber 4'),
|
|
|
])
|
|
])
|
|
|
- rebring_disks_mock.assert_called_once_with(disk_nums=['2', '3'])
|
|
|
|
|
|
|
+
|
|
|
|
|
+ def test__set_volumes_drive_letter_exception(self):
|
|
|
|
|
+ self.tools._conn.exec_ps_command.side_effect = [
|
|
|
|
|
+ GET_PARTITION_OUTPUT, None, exception.CoriolisException]
|
|
|
|
|
+ with self.assertLogs(
|
|
|
|
|
+ 'coriolis.osmorphing.osmount.windows', logging.WARNING):
|
|
|
|
|
+ self.tools._set_volumes_drive_letter()
|
|
|
|
|
|
|
|
@mock.patch.object(windows.WindowsMountTools, '_get_system_drive')
|
|
@mock.patch.object(windows.WindowsMountTools, '_get_system_drive')
|
|
|
@mock.patch.object(windows.WindowsMountTools, '_get_fs_roots')
|
|
@mock.patch.object(windows.WindowsMountTools, '_get_fs_roots')
|