anaconda-patches April 2016

anaconda-patches@lists.fedorahosted.org

9 participants
1157 discussions

[f24-branch 1/1] Check for mounted partitions as part of sanity_check (#1330820)
by dashea 29 Apr '16

29 Apr '16

From: "Brian C. Lane" <bcl(a)redhat.com> Sometimes partitions end up being mounted, especially during live installations, so add a check to make sure none of the selected disks have mounted partitions. --- pyanaconda/storage_utils.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pyanaconda/storage_utils.py b/pyanaconda/storage_utils.py index ef52b16..174ffae 100644 --- a/pyanaconda/storage_utils.py +++ b/pyanaconda/storage_utils.py @@ -323,6 +323,8 @@ def sanity_check(storage, min_ram=isys.MIN_RAM): exns += verify_LUKS_devices_have_key(storage) + exns += check_mounted_partitions(storage) + return exns @@ -345,6 +347,22 @@ def verify_LUKS_devices_have_key(storage): yield LUKSDeviceWithoutKeyError(_("Encryption requested for LUKS device %s but no encryption key specified for this device.") % (dev.name,)) +def check_mounted_partitions(storage): + """ Check the selected disks to make sure all their partitions are unmounted. + + :rtype: generator of str + :returns: a generator of error messages, may yield no error messages + """ + for disk in storage.disks: + if not disk.format: + continue + + for part in disk.format.partitions: + if part.busy: + yield SanityError(_("%s is currently mounted and cannot be used for the " + "installation. Please unmount it and retry.") % part.path) + + def bound_size(size, device, old_size): """ Returns a size bounded by the maximum and minimum size for the device. -- To view this commit on github, visit https://github.com/rhinstaller/anaconda/commit/fe6aa5b01eeed898801f1d418703…

1 0

New: [rhinstaller/anaconda/pulls/613 f24-branch] Check for mounted partitions as part of sanity_check (#1330820)
by dashea 29 Apr '16

29 Apr '16

Sometimes partitions end up being mounted, especially during live installations, so add a check to make sure none of the selected disks have mounted partitions. -- To view this pull request on github, visit https://github.com/rhinstaller/anaconda/pull/613

1 0

[2.0-devel 2/2] Adapt the tests to the fact that we are now rounding up by default
by dashea 29 Apr '16

29 Apr '16

From: Vratislav Podzimek <vpodzime(a)redhat.com> The change was enforced by the fact that the libbytesize author (me) has always found ROUND_HALF_UP confusing which is why libbytesize doesn't support ROUND_HALF_UP. The default is now ROUND_UP, but we are specifying it explicitly everywhere in our code anyway. --- tests/size_test.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/size_test.py b/tests/size_test.py index 7182962..ce855ef 100644 --- a/tests/size_test.py +++ b/tests/size_test.py @@ -278,19 +278,19 @@ def test_round_to_nearest(self): self.assertEqual(size.ROUND_DEFAULT, size.ROUND_UP) s = Size("10.3 GiB") - self.assertEqual(s.round_to_nearest(GiB), Size("10 GiB")) + self.assertEqual(s.round_to_nearest(GiB), Size("11 GiB")) self.assertEqual(s.round_to_nearest(GiB, rounding=size.ROUND_DEFAULT), - Size("10 GiB")) + Size("11 GiB")) self.assertEqual(s.round_to_nearest(GiB, rounding=size.ROUND_DOWN), Size("10 GiB")) self.assertEqual(s.round_to_nearest(GiB, rounding=size.ROUND_UP), Size("11 GiB")) # >>> Size("10.3 GiB").convert_to(MiB) # Decimal('10547.19999980926513671875') - self.assertEqual(s.round_to_nearest(MiB), Size("10547 MiB")) + self.assertIsInstance(s.round_to_nearest(MiB), Size) + self.assertEqual(s.round_to_nearest(MiB), Size("10548 MiB")) self.assertEqual(s.round_to_nearest(MiB, rounding=size.ROUND_UP), Size("10548 MiB")) - self.assertIsInstance(s.round_to_nearest(MiB), Size) with self.assertRaises(ValueError): s.round_to_nearest(MiB, rounding='abc') @@ -315,12 +315,12 @@ def test_round_to_nearest(self): Size(0)) # test Size parameters - self.assertEqual(s.round_to_nearest(Size("128 GiB")), Size("512 GiB")) + self.assertEqual(s.round_to_nearest(Size("128 GiB"), rounding=size.ROUND_DOWN), Size("512 GiB")) self.assertEqual(s.round_to_nearest(Size("1 KiB")), Size("513 GiB")) self.assertEqual(s.round_to_nearest(Size("1 TiB")), Size("1 TiB")) self.assertEqual(s.round_to_nearest(Size("1 TiB"), rounding=size.ROUND_DOWN), Size(0)) self.assertEqual(s.round_to_nearest(Size(0)), Size(0)) - self.assertEqual(s.round_to_nearest(Size("13 GiB")), Size("507 GiB")) + self.assertEqual(s.round_to_nearest(Size("13 GiB"), rounding=size.ROUND_DOWN), Size("507 GiB")) with self.assertRaises(ValueError): s.round_to_nearest(Size("-1 B")) -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/de8e513a9b4c3cd1ba0bac974bc693…

1 0

New: [rhinstaller/blivet/pulls/399 2.0-devel] Size tests fix
by dashea 29 Apr '16

29 Apr '16

This should fix the recent failures of tests because of libbytesize's translations being finally in place. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/399

1 0

[2.0-devel 1/2] Use libbytesize's translations for Size tests
by dashea 29 Apr '16

29 Apr '16

From: Vratislav Podzimek <vpodzime(a)redhat.com> The translations are provided by libbytesize. --- tests/size_test.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/size_test.py b/tests/size_test.py index 4e28853..7182962 100644 --- a/tests/size_test.py +++ b/tests/size_test.py @@ -32,7 +32,10 @@ from decimal import Decimal -from blivet.i18n import _ +# use libbytesize's translations for Size instances +import gettext +_BS = lambda x: gettext.translation("libbytesize", fallback=True).gettext(x) if x != "" else "" + from blivet import size from blivet.size import Size from blivet.size import B, KiB, MiB, GiB, TiB @@ -244,22 +247,22 @@ def test_translated(self): self.assertEqual(s, Size("56.19 MiB")) # Check native parsing - self.assertEqual(s, Size("56.19 %s%s" % (_("Mi"), _("B")))) + self.assertEqual(s, Size("56.19 %s" % (_BS("MiB")))) # Check native parsing, all lowercase - self.assertEqual(s, Size(("56.19 %s%s" % (_("Mi"), _("B"))).lower())) + self.assertEqual(s, Size(("56.19 %s" % (_BS("MiB"))).lower())) # Check native parsing, all uppercase - self.assertEqual(s, Size(("56.19 %s%s" % (_("Mi"), _("B"))).upper())) + self.assertEqual(s, Size(("56.19 %s" % (_BS("MiB"))).upper())) # If the radix separator is not a period, repeat the tests with the # native separator radix = locale.nl_langinfo(locale.RADIXCHAR) if radix != '.': self.assertEqual(s, Size("56%s19 MiB" % radix)) - self.assertEqual(s, Size("56%s19 %s%s" % (radix, _("Mi"), _("B")))) - self.assertEqual(s, Size(("56%s19 %s%s" % (radix, _("Mi"), _("B"))).lower())) - self.assertEqual(s, Size(("56%s19 %s%s" % (radix, _("Mi"), _("B"))).upper())) + self.assertEqual(s, Size("56%s19 %s" % (radix, _BS("MiB")))) + self.assertEqual(s, Size(("56%s19 %s" % (radix, _BS("MiB"))).lower())) + self.assertEqual(s, Size(("56%s19 %s" % (radix, _BS("MiB"))).upper())) def test_human_readable_translation(self): s = Size("56.19 MiB") @@ -268,7 +271,7 @@ def test_human_readable_translation(self): os.environ['LANG'] = lang locale.setlocale(locale.LC_ALL, '') - self.assertTrue(s.human_readable().endswith("%s%s" % (_("Mi"), _("B")))) + self.assertTrue(s.human_readable().endswith("%s" % (_BS("MiB")))) self.assertEqual(s.human_readable(xlate=False), size_str) def test_round_to_nearest(self): -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/c88518b25f0f3b341166c7d464a8b0…

1 0

Re: [rhinstaller/blivet/pulls/397 1.20-devel] Break the cycle in LVMPhysicalVolume.destroy (#1331630)
by dashea 29 Apr '16

29 Apr '16

Closed. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/397

1 0

Re: [rhinstaller/blivet/pulls/396 2.2-devel] Add an InitializeDisk method to DBusBlivet
by dashea 29 Apr '16

29 Apr '16

Closed. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/396

1 0

[2.2-devel 1/1] Add method DBusBlivet.InitializeDisk.
by dashea 29 Apr '16

29 Apr '16

From: David Lehman <dlehman(a)redhat.com> --- blivet/dbus/blivet.py | 7 +++++++ tests/dbus_test.py | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/blivet/dbus/blivet.py b/blivet/dbus/blivet.py index d69f7b8..96c1fa7 100644 --- a/blivet/dbus/blivet.py +++ b/blivet/dbus/blivet.py @@ -109,3 +109,10 @@ def RemoveDevice(self, object_path): """ Remove a device and all devices built on it. """ device = self._dbus_devices[object_path] self._blivet.devicetree.recursive_remove(device) + + @dbus.service.method(dbus_interface=BLIVET_INTERFACE, in_signature='o') + def InitializeDisk(self, object_path): + """ Clear a disk and create a disklabel on it. """ + self.RemoveDevice(object_path) + device = self._dbus_devices[object_path] + self._blivet.initialize_disk(device) diff --git a/tests/dbus_test.py b/tests/dbus_test.py index 203bb9f..5c61840 100644 --- a/tests/dbus_test.py +++ b/tests/dbus_test.py @@ -54,6 +54,18 @@ def test_RemoveDevice(self): self.dbus_object._blivet.devicetree.recursive_remove.assert_called_once_with(device_mock) self.dbus_object._blivet.reset_mock() + def test_InitializeDisk(self): + self.dbus_object._blivet.reset_mock() + object_path = '/com/redhat/Blivet1/Devices/23' + device_mock = Mock("device 23") + with patch.object(self.dbus_object, '_dbus_devices', new=dict()): + self.dbus_object._dbus_devices[object_path] = device_mock + self.dbus_object.InitializeDisk(object_path) + + self.dbus_object._blivet.devicetree.recursive_remove.assert_called_once_with(device_mock) + self.dbus_object._blivet.initialize_disk.assert_called_once_with(device_mock) + self.dbus_object._blivet.reset_mock() + class DBusObjectTestCase(TestCase): @patch.object(DBusObject, '__init__', return_value=None) -- To view this commit on github, visit https://github.com/rhinstaller/blivet/commit/e4c788773782c953b4167756b1812e…

1 0

Updated: [rhinstaller/blivet/pulls/396 2.2-devel] Add an InitializeDisk method to DBusBlivet
by dashea 29 Apr '16

29 Apr '16

This is just one commit on top of #392 and #394. I closed #395 because I accidentally created it against `master` instead of `2.2-devel`. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/396

1 0

Re: [rhinstaller/blivet/pulls/394 2.2-devel] Add a RemoveDevice method to DBusBlivet
by dashea 29 Apr '16

29 Apr '16

Closed. -- To view this pull request on github, visit https://github.com/rhinstaller/blivet/pull/394

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

anaconda-patches April 2016