Differential D799

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

Authored by adamwill on Mar 31 2016, 9:23 PM.

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQATESTS591b1532386f: 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.

Diff Detail

Repository
rOPENQATESTS os-autoinst-distri-fedora
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.
adamwill retitled this revision from to revise updates.img test to work with new anaconda (T759).Mar 31 2016, 9:23 PM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
adamwill updated this revision to Diff 2042.Mar 31 2016, 10:11 PM

adjust updates hard disk image file name

we use the createhdds 'imgver' mechanism to ensure the updates
hard disk image gets rebuilt with the new updates image, so its
file name changes, and we need to update that here.

adamwill updated this revision to Diff 2044.Apr 1 2016, 12:05 AM

tweak the needle a bit

it was a '94% match' when the updates image isn't applied at all,
so let's strengthen it a bit: add a second area and require a 100%
match, because there's really no fuzz to 'block of pink'.

garretraziel accepted this revision.Apr 1 2016, 12:27 PM

Looks good to me.

This revision is now accepted and ready to land.Apr 1 2016, 12:27 PM

Revision Contents

Diff 2048

View Options

needles/anaconda_install_destination_pony.json

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

needles/anaconda_install_destination_pony.png

  • This binary file was deleted.
View Options

needles/anaconda_install_destination_pony_selected.json

  • This file was deleted.
This file was completely deleted. Show File Contents
View Options

needles/anaconda_install_destination_pony_selected.png

  • This binary file was deleted.
View Options

needles/anaconda_install_destination_updates.json

  • This file was added.
1​{
2​ "area": [
3​ {
4​ "height": 12,
5​ "type": "match",
6​ "width": 32,
7​ "xpos": 33,
8​ "ypos": 183,
9​ "match": 100
10​ },
11​ {
12​ "height": 11,
13​ "type": "match",
14​ "width": 29,
15​ "xpos": 122,
16​ "ypos": 183,
17​ "match": 100
18​ }
19​ ],
20​ "tags": [
21​ "anaconda_install_destination_updates",
22​ "ENV-DISTRI-fedora"
23​ ]
24​}
View Options

needles/anaconda_install_destination_updates.png

  • This binary file was added.
View Options

templates

Show First 20 Lines • Show All 1098 Lines • ▼ Show 20 Line(s)1096 settings => [
1099 { key => "HDD_2", value => "disk_full_mbr.img" }, 1099​ { key => "HDD_2", value => "disk_full_mbr.img" },
1100 { key => "ROOT_PASSWORD", value => "weakpassword" }, 1100​ { key => "ROOT_PASSWORD", value => "weakpassword" },
1101 ], 1101​ ],
1102 }, 1102​ },
1103 { 1103​ {
1104 name => "install_scsi_updates_img", 1104​ name => "install_scsi_updates_img",
1105 settings => [ 1105​ settings => [
1106 { key => "BOOT_UPDATES_IMG_URL", value => "1" }, 1106​ { key => "BOOT_UPDATES_IMG_URL", value => "1" },
1107 { key => "GRUB", value => "inst.updates=https://fedorapeople.org/groups/qa/updates/updates-unipony.img" }, 1107​ { key => "GRUB", value => "inst.updates=https://fedorapeople.org/groups/qa/updates/updates-openqa.img" },
1108 { key => "HDDMODEL", value => "virtio-scsi-pci" }, 1108​ { key => "HDDMODEL", value => "virtio-scsi-pci" },
1109 { key => "CDMODEL", value => "scsi-cd" }, 1109​ { key => "CDMODEL", value => "scsi-cd" },
1110 ], 1110​ ],
1111 }, 1111​ },
1112 { 1112​ {
1113 name => "install_kickstart_user_creation", 1113​ name => "install_kickstart_user_creation",
1114 settings => [ 1114​ settings => [
1115 { key => "KICKSTART", value => "1" }, 1115​ { key => "KICKSTART", value => "1" },
▲ Show 20 Lines • Show All 164 Lines • ▼ Show 20 Line(s)1276 settings => [
1280 { key => "UPGRADE", value => "desktop" }, 1280​ { key => "UPGRADE", value => "desktop" },
1281 { key => "DESKTOP", value => "gnome" }, 1281​ { key => "DESKTOP", value => "gnome" },
1282 ], 1282​ ],
1283 }, 1283​ },
1284 { 1284​ {
1285 name => "install_updates_img_local", 1285​ name => "install_updates_img_local",
1286 settings => [ 1286​ settings => [
1287 { key => "NUMDISKS", value => "2" }, 1287​ { key => "NUMDISKS", value => "2" },
1288 { key => "HDD_2", value => "disk_updates_img.img" }, 1288​ { key => "HDD_2", value => "disk_updates_img_2.img" },
1289 { key => "BOOT_UPDATES_IMG_URL", value => "1" }, 1289​ { key => "BOOT_UPDATES_IMG_URL", value => "1" },
1290 { key => "GRUB", value => "inst.updates=hd:LABEL=UPDATES_IMG:/updates.img" }, 1290​ { key => "GRUB", value => "inst.updates=hd:LABEL=UPDATES_IMG:/updates.img" },
1291 ], 1291​ ],
1292 }, 1292​ },
1293 { 1293​ {
1294 name => "install_shrink_ext4", 1294​ name => "install_shrink_ext4",
1295 settings => [ 1295​ settings => [
1296 { key => "ROOT_PASSWORD", value => "weakpassword" }, 1296​ { key => "ROOT_PASSWORD", value => "weakpassword" },
▲ Show 20 Lines • Show All 84 Lines • Show Last 20 Lines
View Options

tests/disk_guided_empty.pm

1use base "anacondatest"; 1​use base "anacondatest";
2use strict; 2​use strict;
3use testapi; 3​use testapi;
4 4​
5sub run { 5​sub run {
6 my $self = shift; 6​ my $self = shift;
7 # Anaconda hub 7​ # Anaconda hub
8 # Go to INSTALLATION DESTINATION and ensure one disk is selected. 8​ # Go to INSTALLATION DESTINATION and ensure one disk is selected.
9 $self->select_disks(); 9​ $self->select_disks();
10 10​
11 # updates.img tests work by changing the appearance of the INSTALLATION 11​ # updates.img tests work by changing the appearance of the INSTALLATION
12 # DESTINATION screen, so check that if needed. 12​ # DESTINATION screen, so check that if needed.
13 if (get_var('BOOT_UPDATES_IMG_URL')){ 13​ if (get_var('BOOT_UPDATES_IMG_URL')){
14 assert_screen "anaconda_install_destination_pony", 30; 14​ assert_screen "anaconda_install_destination_updates", 30;
15 } 15​ }
16 16​
17 assert_and_click "anaconda_spoke_done"; 17​ assert_and_click "anaconda_spoke_done";
18 18​
19 # Anaconda hub 19​ # Anaconda hub
20 assert_screen "anaconda_main_hub", 300; # 20​ assert_screen "anaconda_main_hub", 300; #
21 21​
22} 22​}
Show All 12 Lines