revise updates.img test to work with new anaconda (T759)

Summary:
per details in T759, the 'unipony' updates image we use to test
the updates image features doesn't work with latest anaconda (f24
and Rawhide). I've built a new updates image which uses a neat
anaconda feature that allows you to override CSS with a file in
a special location; it sets the background for disk capacity
texts on the INSTALLATION DESTINATION spoke to be pink. This
lets us use a simple needle that just looks for a pink blob on
that spoke, on the basis that it's unlikely there'll ever be a
pink blob there for any other reason, so if there is one, the
updates image worked. There will be an accompanying tools diff
to change the updates disk image to use the new updates image.

Test Plan:
Do a test run and check the updates image tests pass
and no other tests are broken. You'll need to pull in the tools
diff and re-generate the updates disk image to check that test,
the scsi_updates_img test should work with just this diff.

Reviewers: jskladan, garretraziel

Reviewed By: garretraziel

Subscribers: tflink

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D799
This commit is contained in:
Adam Williamson 2016-04-01 08:00:47 -07:00
parent 9992375d0a
commit 591b153238
8 changed files with 27 additions and 36 deletions

View File

@ -1,16 +0,0 @@
{
"tags": [
"anaconda_install_destination_pony",
"ENV-DISTRI-fedora",
"ENV-FLAVOR-server"
],
"area": [
{
"xpos": 97,
"ypos": 225,
"width": 32,
"height": 29,
"type": "match"
}
]
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

View File

@ -1,17 +0,0 @@
{
"tags": [
"anaconda_install_destination_pony",
"ENV-DISTRI-fedora",
"ENV-FLAVOR-develop"
],
"area": [
{
"xpos": 92,
"ypos": 237,
"width": 25,
"height": 26,
"type": "match"
}
],
"properties": []
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 KiB

View File

@ -0,0 +1,24 @@
{
"area": [
{
"height": 12,
"type": "match",
"width": 32,
"xpos": 33,
"ypos": 183,
"match": 100
},
{
"height": 11,
"type": "match",
"width": 29,
"xpos": 122,
"ypos": 183,
"match": 100
}
],
"tags": [
"anaconda_install_destination_updates",
"ENV-DISTRI-fedora"
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 57 KiB

View File

@ -1104,7 +1104,7 @@
name => "install_scsi_updates_img",
settings => [
{ key => "BOOT_UPDATES_IMG_URL", value => "1" },
{ key => "GRUB", value => "inst.updates=https://fedorapeople.org/groups/qa/updates/updates-unipony.img" },
{ key => "GRUB", value => "inst.updates=https://fedorapeople.org/groups/qa/updates/updates-openqa.img" },
{ key => "HDDMODEL", value => "virtio-scsi-pci" },
{ key => "CDMODEL", value => "scsi-cd" },
],
@ -1285,7 +1285,7 @@
name => "install_updates_img_local",
settings => [
{ key => "NUMDISKS", value => "2" },
{ key => "HDD_2", value => "disk_updates_img.img" },
{ key => "HDD_2", value => "disk_updates_img_2.img" },
{ key => "BOOT_UPDATES_IMG_URL", value => "1" },
{ key => "GRUB", value => "inst.updates=hd:LABEL=UPDATES_IMG:/updates.img" },
],

View File

@ -11,7 +11,7 @@ sub run {
# updates.img tests work by changing the appearance of the INSTALLATION
# DESTINATION screen, so check that if needed.
if (get_var('BOOT_UPDATES_IMG_URL')){
assert_screen "anaconda_install_destination_pony", 30;
assert_screen "anaconda_install_destination_updates", 30;
}
assert_and_click "anaconda_spoke_done";