diff --git a/stages/test/test_mkfs_btrfs.py b/stages/test/test_mkfs_btrfs.py index 70286d82..9fddcf02 100644 --- a/stages/test/test_mkfs_btrfs.py +++ b/stages/test/test_mkfs_btrfs.py @@ -71,9 +71,9 @@ def test_mkfs_btrfs_integration(tmp_path, stage_module): output = subprocess.check_output([ "btrfs", "filesystem", "show", fake_disk_path], encoding="utf-8") assert f'uuid: {fake_uuid}' in output, \ - f'expected UUID not found in: {output}' + f'expected UUID not found in: {output}' assert f'Label: \'{fake_label}\'' in output, \ - f'expected label not found in: {output}' + f'expected label not found in: {output}' @pytest.mark.parametrize("test_input, expected", [ diff --git a/stages/test/test_mkfs_fat.py b/stages/test/test_mkfs_fat.py index 5e336505..f79b5e43 100644 --- a/stages/test/test_mkfs_fat.py +++ b/stages/test/test_mkfs_fat.py @@ -74,11 +74,11 @@ def test_mkfs_fat_integration(tmp_path, stage_module): output = subprocess.check_output([ "file", "-s", fake_disk_path], encoding="utf-8") assert f'serial number 0x{fake_volid}' in output, \ - f'expected serial number (volid) not found in: {output}' + f'expected serial number (volid) not found in: {output}' assert f'label: "{fake_label} "' in output, \ - f'expected label not found in: {output}' + f'expected label not found in: {output}' assert f'FAT ({fat_size} bit)' in output, \ - f'expected FAT size not found in: {output}' + f'expected FAT size not found in: {output}' @pytest.mark.parametrize("test_input, expected", [ diff --git a/stages/test/test_mkfs_xfs.py b/stages/test/test_mkfs_xfs.py index af024ae6..70ea1b05 100644 --- a/stages/test/test_mkfs_xfs.py +++ b/stages/test/test_mkfs_xfs.py @@ -71,9 +71,9 @@ def test_mkfs_xfs_integration(tmp_path, stage_module): output = subprocess.check_output([ "xfs_admin", "-l", "-u", fake_disk_path], encoding="utf-8") assert f'UUID = {fake_uuid}' in output, \ - f'expected UUID not found in: {output}' + f'expected UUID not found in: {output}' assert f'label = "{fake_label}"' in output, \ - f'expected label not found in: {output}' + f'expected label not found in: {output}' @pytest.mark.parametrize("test_input, expected", [ diff --git a/test/run/test_mount.py b/test/run/test_mount.py index ab99fe60..5ec1f51f 100755 --- a/test/run/test_mount.py +++ b/test/run/test_mount.py @@ -178,8 +178,8 @@ def create_image_with_partitions(tmp_path): ["parted", "--script", img, "mklabel", "msdos"], ["parted", "--script", img, "mkpart", "primary", "ext4", "1MiB", "10Mib"], ["parted", "--script", img, "mkpart", "primary", "ext4", "10MiB", "19Mib"], - ["mkfs.ext4", "-F", "-E", f"offset={1*1024*1024}", img, "9M"], - ["mkfs.ext4", "-F", "-E", f"offset={10*1024*1024}", img, "9M"], + ["mkfs.ext4", "-F", "-E", f"offset={1 * 1024 * 1024}", img, "9M"], + ["mkfs.ext4", "-F", "-E", f"offset={10 * 1024 * 1024}", img, "9M"], ]: subprocess.check_call(cmd) return tree, img.name diff --git a/tools/osbuild-mpp b/tools/osbuild-mpp index 23f68585..0252eac6 100755 --- a/tools/osbuild-mpp +++ b/tools/osbuild-mpp @@ -1069,7 +1069,7 @@ class ManifestFile: prob = "" if hasattr(err, 'problem_mark'): mark = err.problem_mark - prob = f": {err.problem} at line {mark.line+1} (col {mark.column+1})" + prob = f": {err.problem} at line {mark.line + 1} (col {mark.column + 1})" print(f"Invalid yaml in \"{path}\"{prob}") sys.exit(1) else: