From 8b401183f4aa2c59554a545b53f36d0acc6b0c78 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Wed, 31 Jan 2024 14:20:15 +0100 Subject: [PATCH 1/5] Remove unused import --- blivet/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blivet/__init__.py b/blivet/__init__.py index 42524bded..80aca1e86 100644 --- a/blivet/__init__.py +++ b/blivet/__init__.py @@ -27,7 +27,7 @@ import warnings import syslog -from . import util, arch +from . import arch import logging log = logging.getLogger("blivet") From d8c50a06908d42dfc3c6710c741017aee5a0ffd2 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Wed, 31 Jan 2024 14:20:41 +0100 Subject: [PATCH 2/5] Fix typos --- CONTRIBUTING | 2 +- blivet/fstab.py | 4 ++-- doc/intro.rst | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CONTRIBUTING b/CONTRIBUTING index 199f06a17..6be098cd6 100644 --- a/CONTRIBUTING +++ b/CONTRIBUTING @@ -109,7 +109,7 @@ work to other active development branches and to ``master``. ``git push`` - if there is no ``x.{y+1}-devel``, merge it onto ``{x+1}.y`` branches - as appopriate, oldest-to-newest + as appropriate, oldest-to-newest For example, if you already merged onto ``2.1-devel`` and there is no ``2.2-devel``, the next place to merge would be ``3.0-devel`` if diff --git a/blivet/fstab.py b/blivet/fstab.py index 5981a9514..9286b5d89 100644 --- a/blivet/fstab.py +++ b/blivet/fstab.py @@ -38,7 +38,7 @@ def __init__(self): self.freq = None self.passno = None - # prefered spec identification type; default "UUID" + # preferred spec identification type; default "UUID" # possible values: None, "UUID", "LABEL", "PARTLABEL", "PARTUUID", "PATH" self.spec_type = None @@ -296,7 +296,7 @@ def __init__(self, src_file=None, dest_file=None): self.src_file = src_file self.dest_file = dest_file - # prefered spec identification type; default "UUID" + # preferred spec identification type; default "UUID" # possible values: None, "UUID", "LABEL", "PARTLABEL", "PARTUUID", "PATH" self.spec_type = None diff --git a/doc/intro.rst b/doc/intro.rst index a0918d0a3..2f8b5e8fa 100644 --- a/doc/intro.rst +++ b/doc/intro.rst @@ -4,7 +4,7 @@ Introduction to Blivet Blivet is a python module for system storage configuration. The main thing that blivet offers is the ability to model a series of changes -without necessarily commiting any of the changes to disk. You can schedule an +without necessarily committing any of the changes to disk. You can schedule an arbitrarily large series of changes (called 'actions'), seeing the effects of each (within the :class:`~.devicetree.DeviceTree` instance) as it is scheduled. Nothing is written to disk, however, until you execute the actions. @@ -84,7 +84,7 @@ To make changes to the configuration you'll schedule actions, but At this point, the StorageDevice representing sda3 is no longer in the tree. That means you could allocate a new partition from the newly free space if you wanted to (via blivet, that is, since there is not actually any free space on -the physical disk yet -- you haven't commited the changes). If you now ran the +the physical disk yet -- you haven't committed the changes). If you now ran the following line:: sda3 = b.devicetree.get_device_by_name("sda3") From fe17ad97613bee4864f0aac144eff5f3964584c7 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Wed, 31 Jan 2024 14:25:35 +0100 Subject: [PATCH 3/5] misc: Bump libblockdev version for Debian --- misc/install-test-dependencies.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc/install-test-dependencies.yml b/misc/install-test-dependencies.yml index 460627ae7..ec9982e4b 100644 --- a/misc/install-test-dependencies.yml +++ b/misc/install-test-dependencies.yml @@ -132,9 +132,9 @@ state: present name: - python3-blockdev - - libblockdev2 + - libblockdev3 - libblockdev-plugins-all - - gir1.2-blockdev-2.0 + - gir1.2-blockdev-3.0 - python3-bytesize - python3-selinux - python3-pyudev From 4db5737a1487bb205c84df67650b9aef1d667eea Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Wed, 31 Jan 2024 14:27:47 +0100 Subject: [PATCH 4/5] tests: Skip MD storage tests on RHEL/CentOS 9 The tests are randomly failing on CentOS 9 -- the newly created array is not assembled after reset. --- tests/skip.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/skip.yml b/tests/skip.yml index 8d353b1ba..3da848944 100644 --- a/tests/skip.yml +++ b/tests/skip.yml @@ -23,3 +23,9 @@ # - all "skips" can specified as a list, for example 'version: [10, 11]' --- + +- test: storage_tests.devices_test.md_test.MDTestCase + skip_on: + - distro: "centos" + version: "9" + reason: "MD tests are randomly failing on RHEL/CentOS 9" From 4c3dfd722a484b476d521282ebb3995e6a286b66 Mon Sep 17 00:00:00 2001 From: Vojtech Trefny Date: Wed, 31 Jan 2024 14:31:37 +0100 Subject: [PATCH 5/5] pylint: Remove some old false positives --- tests/pylint/runpylint.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/pylint/runpylint.py b/tests/pylint/runpylint.py index 196222495..eef4047fa 100755 --- a/tests/pylint/runpylint.py +++ b/tests/pylint/runpylint.py @@ -18,17 +18,14 @@ def __init__(self): self.pylintrc_path = os.path.join(current_dir, "pylintrc") self.false_positives = [ - FalsePositive(r"Catching an exception which doesn't inherit from (BaseException|Exception): (BlockDev|DM|Crypto|Swap|LVM|Btrfs|MDRaid|Utils|G)Error$"), FalsePositive(r"Instance of 'int' has no .* member"), FalsePositive(r"Method 'do_task' is abstract in class 'Task' but is not overridden"), FalsePositive(r"Method 'do_task' is abstract in class 'UnimplementedTask' but is not overridden"), FalsePositive(r"No value for argument 'member_count' in unbound method call$"), FalsePositive(r"No value for argument 'smallest_member_size' in unbound method call$"), - FalsePositive(r"Parameters differ from overridden 'do_task' method$"), FalsePositive(r"Bad option value '(subprocess-popen-preexec-fn|try-except-raise|environment-modify|arguments-renamed|redundant-u-string-prefix)'"), FalsePositive(r"Instance of '(Action.*Device|Action.*Format|Action.*Member|Device|DeviceAction|DeviceFormat|Event|ObjectID|PartitionDevice|StorageDevice|BTRFS.*Device|LoopDevice)' has no 'id' member$"), FalsePositive(r"Instance of 'GError' has no 'message' member"), # overriding currently broken local pylint disable - FalsePositive(r"Module '(gi.repository.Gio|gi.repository.GLib)' has no .* member"), # pylint/astroid has issues with GI modules https://github.com/PyCQA/pylint/issues/6352 FalsePositive(r"No name '.*' in module 'libmount'") ]