Merge branch 'develop' into adopt_uefi

This commit is contained in:
Alan Marshall 2024-08-07 07:55:28 +01:00
commit 1455767f39
Signed by: alangm
GPG Key ID: 4DF85D1B967F51A6
83 changed files with 13 additions and 494 deletions

View File

@ -57,11 +57,11 @@ for testpath in testpaths:
# now let's do some whitelisting, for awkward cases where we know that # now let's do some whitelisting, for awkward cases where we know that
# we concatenate string literals and stuff # we concatenate string literals and stuff
# versioned backgrounds and release IDs # versioned backgrounds and release IDs
for rel in range(30, 100): for rel in ["8", "9", "10"]:
testliterals.append(f"{rel}_background") testliterals.append(f"{rel}_background")
testliterals.append(f"version_{rel}_ident") testliterals.append(f"version_{rel}_ident")
# anaconda id needles, using tell_source # anaconda id needles, using tell_source
for source in ("workstation", "generic", "server"): for source in ("generic", "server"):
testliterals.append(f"leftbar_{source}") testliterals.append(f"leftbar_{source}")
testliterals.append(f"topbar_{source}") testliterals.append(f"topbar_{source}")
# keyboard layout switching, using desktop_switch_layout # keyboard layout switching, using desktop_switch_layout
@ -69,7 +69,7 @@ for environment in ("anaconda", "gnome"):
for layout in ("native", "ascii"): for layout in ("native", "ascii"):
testliterals.append(f"{environment}_layout_{layout}") testliterals.append(f"{environment}_layout_{layout}")
# package set selection, using get_var('PACKAGE_SET') # package set selection, using get_var('PACKAGE_SET')
for pkgset in ("kde", "workstation", "minimal"): for pkgset in ("minimal", "server", "graphical-server", "workstation", "virtualization-host"):
testliterals.append(f"anaconda_{pkgset}_highlighted") testliterals.append(f"anaconda_{pkgset}_highlighted")
testliterals.append(f"anaconda_{pkgset}_selected") testliterals.append(f"anaconda_{pkgset}_selected")
# desktop_login stuff # desktop_login stuff
@ -93,6 +93,16 @@ for dtype in ("lvmvg", "lvmlv", "lvmthin", "raid"):
for fsys in ("ext3", "ext4", "xfs", "btrfs", "ppc_prep_boot", "swap", "efi_filesystem"): for fsys in ("ext3", "ext4", "xfs", "btrfs", "ppc_prep_boot", "swap", "efi_filesystem"):
testliterals.append(f"anaconda_blivet_part_fs_{fsys}") testliterals.append(f"anaconda_blivet_part_fs_{fsys}")
testliterals.append(f"anaconda_blivet_part_fs_{fsys}_selected") testliterals.append(f"anaconda_blivet_part_fs_{fsys}_selected")
# custom_gui
for dtype in ("", "_lvmlv", "_raid", "_standard_partition"):
testliterals.append(f"anaconda_custom_part_devicetype{dtype}")
for ptype in ("raid_1", "raid_4"):
testliterals.append(f"anaconda_custom_part_{ptype}")
testliterals.append(f"anaconda_custom_part_{ptype}_selected")
for fsys in ("efi_filesystem", "ext4", "swap", "xfs"):
testliterals.append(f"anaconda_custom_part_fs_{fsys}")
testliterals.append(f"anaconda_custom_part_fs_{fsys}_selected")
# this is variable-y in custom_change_type but we only actually have # this is variable-y in custom_change_type but we only actually have
# one value # one value
testliterals.append("anaconda_part_device_type_raid") testliterals.append("anaconda_part_device_type_raid")

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 9,
"type": "match",
"width": 139,
"height": 701,
"ypos": 45
}
],
"properties": [],
"tags": [
"leftbar_workstation"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 89 KiB

View File

@ -1,15 +0,0 @@
{
"properties": [],
"tags": [
"leftbar_workstation"
],
"area": [
{
"xpos": 9,
"ypos": 44,
"width": 139,
"height": 701,
"type": "match"
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

View File

@ -1,15 +0,0 @@
{
"properties": [],
"tags": [
"topbar_workstation"
],
"area": [
{
"xpos": 95,
"ypos": 69,
"width": 675,
"height": 38,
"type": "match"
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 91 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 796,
"ypos": 40,
"width": 93,
"height": 32,
"type": "match"
}
],
"properties": [],
"tags": [
"version_30_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 164 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"ypos": 13,
"height": 20,
"width": 124,
"type": "match",
"xpos": 764
}
],
"properties": [],
"tags": [
"version_31_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 783,
"ypos": 40,
"width": 90,
"height": 20,
"type": "match"
}
],
"properties": [],
"tags": [
"version_31_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 107 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 782,
"ypos": 15,
"width": 114,
"height": 17,
"type": "match"
}
],
"properties": [],
"tags": [
"version_32_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 787,
"ypos": 15,
"width": 83,
"height": 17,
"type": "match"
}
],
"properties": [],
"tags": [
"version_32_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 98 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 784,
"height": 19,
"ypos": 13,
"width": 85,
"type": "match"
}
],
"properties": [],
"tags": [
"version_33_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 778,
"ypos": 13,
"width": 118,
"height": 19,
"type": "match"
}
],
"properties": [],
"tags": [
"version_33_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"ypos": 14,
"height": 17,
"xpos": 785,
"type": "match",
"width": 87
}
],
"properties": [],
"tags": [
"version_34_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 95 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 778,
"ypos": 14,
"width": 117,
"height": 17,
"type": "match"
}
],
"properties": [],
"tags": [
"version_34_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 778,
"ypos": 14,
"width": 118,
"height": 18,
"type": "match"
}
],
"properties": [],
"tags": [
"version_35_ident"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"height": 12,
"ypos": 331,
"type": "match",
"width": 26,
"xpos": 49
}
],
"properties": [],
"tags": [
"anaconda_kde_highlighted"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 KiB

View File

@ -1,15 +0,0 @@
{
"tags": [
"anaconda_kde_highlighted"
],
"area": [
{
"ypos": 294,
"type": "match",
"height": 12,
"xpos": 53,
"width": 26
}
],
"properties": []
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 142 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"ypos": 331,
"type": "match",
"height": 12,
"width": 49,
"xpos": 29
}
],
"properties": [],
"tags": [
"anaconda_kde_selected"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"ypos": 225,
"type": "match",
"width": 104,
"xpos": 837,
"height": 121
}
],
"properties": [],
"tags": [
"33_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 886 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"type": "match",
"match": 90,
"width": 81,
"height": 129,
"xpos": 833,
"ypos": 74
}
],
"properties": [],
"tags": [
"33_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 850 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"type": "match",
"match": 90,
"width": 104,
"ypos": 225,
"height": 121,
"xpos": 691
}
],
"properties": [],
"tags": [
"33_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 947 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 838,
"height": 121,
"ypos": 225,
"width": 104,
"type": "match"
}
],
"properties": [],
"tags": [
"33_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 918 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"width": 104,
"type": "match",
"match": 90,
"height": 121,
"xpos": 691,
"ypos": 225
}
],
"properties": [],
"tags": [
"33_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 971 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"xpos": 833,
"height": 129,
"ypos": 74,
"type": "match",
"match": 90,
"width": 81
}
],
"properties": [],
"tags": [
"33_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 MiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"width": 104,
"type": "match",
"match": 90,
"height": 121,
"xpos": 838,
"ypos": 225
}
],
"properties": [],
"tags": [
"33_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 833 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"width": 81,
"type": "match",
"match": 90,
"ypos": 74,
"height": 129,
"xpos": 833
}
],
"properties": [],
"tags": [
"33_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 987 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"ypos": 225,
"type": "match",
"match": 90,
"xpos": 691,
"height": 121,
"width": 104
}
],
"properties": [],
"tags": [
"33_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 790 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 836,
"ypos": 72,
"width": 81,
"height": 129,
"type": "match"
}
],
"properties": [],
"tags": [
"33_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 750 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"width": 104,
"type": "match",
"match": 90,
"ypos": 225,
"height": 121,
"xpos": 691
}
],
"properties": [],
"tags": [
"33_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 801 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"type": "match",
"match": 90,
"width": 142,
"xpos": 794,
"ypos": 313,
"height": 132
}
],
"properties": [],
"tags": [
"34_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 954 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"xpos": 794,
"ypos": 313,
"width": 142,
"height": 132,
"type": "match"
}
],
"properties": [],
"tags": [
"34_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 744 KiB

View File

@ -1,15 +0,0 @@
{
"area": [
{
"height": 132,
"ypos": 312,
"xpos": 794,
"width": 142,
"type": "match"
}
],
"properties": [],
"tags": [
"34_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 847 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"type": "match",
"match": 90,
"width": 142,
"ypos": 313,
"height": 132,
"xpos": 794
}
],
"properties": [],
"tags": [
"34_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 888 KiB

View File

@ -1,16 +0,0 @@
{
"area": [
{
"xpos": 794,
"ypos": 314,
"height": 132,
"type": "match",
"match": 90,
"width": 142
}
],
"properties": [],
"tags": [
"34_background"
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 814 KiB