Differential D451

add fedup desktop test
ClosedPublic
Actions

Authored by garretraziel on Jul 17 2015, 8:28 AM.

Details

Reviewers
adamwill
jskladan
Commits
rOPENQATESTSc8f02969f229: add fedup desktop test
Summary

Add tests for testing fedup with Fedora Workstation (GNOME).
Since almost all of the funcionality is the same as with minimal,
I have merged preinstall and run phases together.

Test Plan

run fedup_minimal and fedup_desktop

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.
garretraziel retitled this revision from to add fedup desktop test.Jul 17 2015, 8:28 AM
garretraziel updated this object.
garretraziel edited the test plan for this revision. (Show Details)
garretraziel added reviewers: jskladan, adamwill.
garretraziel updated this revision to Diff 1197.Jul 17 2015, 8:35 AM
  • add test to templates
jskladan accepted this revision.Jul 17 2015, 8:47 AM

apart of the nit-picks, LGTM

lib/fedoralog.pm
23

Please rename the method to something more self-explaining.

31

Please rename to boot_done_screen or something in the likes of that - booted_image got me a bit confused with ISO image.

This revision is now accepted and ready to land.Jul 17 2015, 8:47 AM
Closed by commit rOPENQATESTSc8f02969f229: add fedup desktop test (authored by Garret Raziel <boloomka@gmail.com>). · Explain WhyJul 17 2015, 10:56 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 1201

View Options

lib/fedoralog.pm

Show All 14 Lines6sub login_as_root {
15 send_key "ret"; 15​ send_key "ret";
16 assert_screen "console_password_required", 10; 16​ assert_screen "console_password_required", 10;
17 type_string $password; 17​ type_string $password;
18 send_key "ret"; 18​ send_key "ret";
19 19​
20 assert_screen "root_logged_in", 10; 20​ assert_screen "root_logged_in", 10;
21} 21​}
22 22​
23sub boot_and_login { 23​sub boot_to_login_screen {
jskladanUnsubmitted
Not Done

Please rename the method to something more self-explaining.

24 my $self = shift; 24​ my $self = shift;
25 wait_still_screen 10; 25​ my $boot_done_screen = shift;
26​ my $stillscreen = shift || 10;
27​ my $timeout = shift || 60;
26 28​
27 $self->login_as_root(3); 29​ wait_still_screen $stillscreen, $timeout;
30​
31​ if ($boot_done_screen ne "") {
jskladanUnsubmitted
Not Done

Please rename to boot_done_screen or something in the likes of that - booted_image got me a bit confused with ISO image.

32​ assert_screen $boot_done_screen;
33​ }
28} 34​}
29 35​
30sub post_fail_hook { 36​sub post_fail_hook {
31 my $self = shift; 37​ my $self = shift;
32 38​
33 $self->login_as_root(2); 39​ $self->login_as_root(2);
34 40​
35 # Upload all ABRT logs 41​ # Upload all ABRT logs
Show All 13 Lines
View Options

main.pm

Show First 20 Lines • Show All 51 Lines • ▼ Show 20 Line(s)
52# Boot to anaconda Hub in English 52​# Boot to anaconda Hub in English
53 53​
54if (get_var("ENTRYPOINT")) 54​if (get_var("ENTRYPOINT"))
55{ 55​{
56 autotest::loadtest get_var('CASEDIR')."/tests/".get_var("ENTRYPOINT").".pm"; 56​ autotest::loadtest get_var('CASEDIR')."/tests/".get_var("ENTRYPOINT").".pm";
57} 57​}
58elsif (get_var("UPGRADE")) 58​elsif (get_var("UPGRADE"))
59{ 59​{
60 autotest::loadtest get_var('CASEDIR')."/tests/upgrade_preinstall_".get_var("UPGRADE").".pm"; 60​ autotest::loadtest get_var('CASEDIR')."/tests/upgrade_preinstall.pm";
61 autotest::loadtest get_var('CASEDIR')."/tests/upgrade_run_".get_var("UPGRADE").".pm"; 61​ autotest::loadtest get_var('CASEDIR')."/tests/upgrade_run.pm";
62 autotest::loadtest get_var('CASEDIR')."/tests/upgrade_postinstall_".get_var("UPGRADE").".pm"; 62​ autotest::loadtest get_var('CASEDIR')."/tests/upgrade_postinstall_".get_var("UPGRADE").".pm";
63} 63​}
64else 64​else
65{ 65​{
66 autotest::loadtest get_var('CASEDIR')."/tests/_boot_to_anaconda.pm"; 66​ autotest::loadtest get_var('CASEDIR')."/tests/_boot_to_anaconda.pm";
67 67​
68 unless (get_var("KICKSTART")) 68​ unless (get_var("KICKSTART"))
69 { 69​ {
▲ Show 20 Lines • Show All 77 Lines • Show Last 20 Lines
View Options

needles/graphical_login_gdm.json

1{ 1​{
2 "tags": [ 2​ "tags": [
3 "ENV-DESKTOP-gnome", 3​ "graphical_login",
4 "ENV-DISTRI-fedora", 4​ "ENV-DISTRI-fedora",
5 "ENV-INSTLANG-en_US", 5​ "ENV-INSTLANG-en_US",
6 "graphical_login" 6​ "ENV-FLAVOR-develop"
7 ], 7​ ],
8​ "properties": [],
8 "area": [ 9​ "area": [
9 { 10​ {
10 "xpos": 335, 11​ "width": 206,
11 "ypos": 423, 12​ "type": "match",
12 "width": 67, 13​ "xpos": 405,
13 "height": 12, 14​ "height": 106,
14 "type": "match" 15​ "ypos": 645
15 } 16​ }
16 ] 17​ ]
17} 18​}
View Options

needles/graphical_login_gdm.png

  • This is a binary file.
View Options

needles/graphical_login_gdm_input.json

  • This file was added.
1​{
2​ "area": [
3​ {
4​ "xpos": 341,
5​ "ypos": 372,
6​ "width": 343,
7​ "height": 65,
8​ "type": "match"
9​ },
10​ {
11​ "xpos": 600,
12​ "ypos": 470,
13​ "width": 80,
14​ "height": 30,
15​ "type": "match"
16​ }
17​ ],
18​ "tags": [
19​ "graphical_login_input",
20​ "ENV-DISTRI-fedora",
21​ "ENV-INSTLANG-en_US",
22​ "ENV-FLAVOR-develop"
23​ ],
24​ "properties": []
25​}
View Options

needles/graphical_login_gdm_input.png

  • This binary file was added.
View Options

needles/text_console_login.json

1{ 1​{
2 "tags": [ 2​ "tags": [
3 "ENV-DESKTOP-default", 3​ "text_console_login",
4 "ENV-DISTRI-fedora", 4​ "ENV-DISTRI-fedora",
5 "ENV-INSTLANG-en_US", 5​ "ENV-INSTLANG-en_US",
6 "text_console_login" 6​ "ENV-FLAVOR-develop"
7 ], 7​ ],
8​ "properties": [],
8 "area": [ 9​ "area": [
9 { 10​ {
11​ "width": 128,
10 "xpos": 0, 12​ "xpos": 0,
13​ "type": "match",
11 "ypos": 49, 14​ "ypos": 49,
12 "width": 140, 15​ "height": 30
13 "height": 50, ​
14 "type": "match" ​
15 } 16​ }
16 ] 17​ ]
17} 18​}
19​No newline at end of file
View Options

needles/text_console_login.png

  • This is a binary file.
View Options

templates

Show First 20 Lines • Show All 180 Lines • ▼ Show 20 Line(s)179 {
181 product => { 181​ product => {
182 arch => "x86_64", 182​ arch => "x86_64",
183 distri => "fedora", 183​ distri => "fedora",
184 flavor => "universal", 184​ flavor => "universal",
185 version => "*", 185​ version => "*",
186 }, 186​ },
187 test_suite => { name => "fedup_minimal" }, 187​ test_suite => { name => "fedup_minimal" },
188 }, 188​ },
189​ {
190​ machine => { name => "64bit" },
191​ product => {
192​ arch => "x86_64",
193​ distri => "fedora",
194​ flavor => "universal",
195​ version => "*",
196​ },
197​ test_suite => { name => "fedup_desktop" },
198​ },
189 ], 199​ ],
190 Machines => [ 200​ Machines => [
191 { 201​ {
192 backend => "qemu", 202​ backend => "qemu",
193 name => "64bit", 203​ name => "64bit",
194 settings => [ 204​ settings => [
195 { key => "QEMUCPU", value => "qemu64" }, 205​ { key => "QEMUCPU", value => "qemu64" },
196 { key => "QEMUCPUS", value => "2"}, 206​ { key => "QEMUCPUS", value => "2"},
▲ Show 20 Lines • Show All 195 Lines • ▼ Show 20 Line(s)390 {
392 variables => "", 402​ variables => "",
393 }, 403​ },
394 { 404​ {
395 name => "fedup_minimal", 405​ name => "fedup_minimal",
396 prio => 15, 406​ prio => 15,
397 settings => [ 407​ settings => [
398 { key => "ROOT_PASSWORD", value => "weakpassword" }, 408​ { key => "ROOT_PASSWORD", value => "weakpassword" },
399 { key => "BOOTFROM", value => "c" }, 409​ { key => "BOOTFROM", value => "c" },
400 { key => "HDD_1", value => "disk_f21.img" }, 410​ { key => "HDD_1", value => "disk_f21_minimal.img" },
401 { key => "UPGRADE", value => "minimal" }, 411​ { key => "UPGRADE", value => "minimal" },
402 ], 412​ ],
403 variables => "", 413​ variables => "",
404 }, 414​ },
415​ {
416​ name => "fedup_desktop",
417​ prio => 15,
418​ settings => [
419​ { key => "ROOT_PASSWORD", value => "weakpassword" },
420​ { key => "BOOTFROM", value => "c" },
421​ { key => "HDD_1", value => "disk_f21_desktop.img" },
422​ { key => "UPGRADE", value => "desktop" },
423​ ],
424​ variables => "",
425​ },
405 ], 426​ ],
406} 427​}
View Options

tests/upgrade_postinstall_desktop.pm

  • This file was moved from tests/upgrade_preinstall_minimal.pm.
1use base "fedoralog"; 1​use base "fedoralog";
2use strict; 2​use strict;
3use testapi; 3​use testapi;
4 4​
5​
5sub run { 6​sub run {
6 my $self = shift; 7​ my $self = shift;
8​ my $password = get_var("PASSWORD", "weakpassword");
7 9​
8 $self->boot_and_login(); 10​ $self->boot_to_login_screen("graphical_login", 20);
9 11​
10 type_string 'yum -y update; echo $?'; ​
11 send_key "ret"; 12​ send_key "ret";
12 13​ assert_screen "graphical_login_input";
13 assert_screen "console_command_success", 1800; 14​ type_string $password;
14 ​
15 type_string "reboot"; ​
16 send_key "ret"; 15​ send_key "ret";
17 16​ assert_screen "graphical_desktop_clean", 30;
18 $self->boot_and_login(); ​
19 ​
20 type_string 'yum -y install fedup; echo $?'; ​
21 send_key "ret"; ​
22 ​
23 assert_screen "console_command_success", 1800; ​
24} 17​}
25 18​
26 19​
27sub test_flags { 20​sub test_flags {
28 # without anything - rollback to 'lastgood' snapshot if failed 21​ # without anything - rollback to 'lastgood' snapshot if failed
29 # 'fatal' - whole test suite is in danger if this fails 22​ # 'fatal' - whole test suite is in danger if this fails
30 # 'milestone' - after this test succeeds, update 'lastgood' 23​ # 'milestone' - after this test succeeds, update 'lastgood'
31 # 'important' - if this fails, set the overall state to 'fail' 24​ # 'important' - if this fails, set the overall state to 'fail'
32 return { fatal => 1 }; 25​ return { fatal => 1 };
33} 26​}
34 27​
351; 28​1;
36 29​
37# vim: set sw=4 et: 30​# vim: set sw=4 et:
View Options

tests/upgrade_postinstall_minimal.pm

1use base "fedoralog"; 1​use base "fedoralog";
2use strict; 2​use strict;
3use testapi; 3​use testapi;
4 4​
5 5​
6sub run { 6​sub run {
7 my $self = shift; 7​ my $self = shift;
8 8​
9 $self->boot_and_login(); 9​ $self->boot_to_login_screen();
10​ $self->login_as_root(3);
10 11​
11 assert_screen "console_f22_installed"; 12​ assert_screen "console_f22_installed";
12} 13​}
13 14​
14 15​
15sub test_flags { 16​sub test_flags {
16 # without anything - rollback to 'lastgood' snapshot if failed 17​ # without anything - rollback to 'lastgood' snapshot if failed
17 # 'fatal' - whole test suite is in danger if this fails 18​ # 'fatal' - whole test suite is in danger if this fails
18 # 'milestone' - after this test succeeds, update 'lastgood' 19​ # 'milestone' - after this test succeeds, update 'lastgood'
19 # 'important' - if this fails, set the overall state to 'fail' 20​ # 'important' - if this fails, set the overall state to 'fail'
20 return { fatal => 1 }; 21​ return { fatal => 1 };
21} 22​}
22 23​
231; 24​1;
24 25​
25# vim: set sw=4 et: 26​# vim: set sw=4 et:
View Options

tests/upgrade_preinstall.pm

  • This file was added.
1​use base "fedoralog";
2​use strict;
3​use testapi;
4​
5​sub run {
6​ my $self = shift;
7​
8​ if (get_var('UPGRADE') eq "desktop") {
9​ $self->boot_to_login_screen("graphical_login", 30); # GDM takes time to load
10​ #} elsif (get_var('UPGRADE' eq "minimal")) {
11​ } else {
12​ $self->boot_to_login_screen();
13​ }
14​ $self->login_as_root(3);
15​
16​ type_string 'yum -y update; echo $?';
17​ send_key "ret";
18​
19​ assert_screen "console_command_success", 1800;
20​
21​ type_string "reboot";
22​ send_key "ret";
23​
24​ if (get_var('UPGRADE') eq "desktop") {
25​ $self->boot_to_login_screen("graphical_login", 30); # GDM takes time to load
26​ #} elsif (get_var('UPGRADE' eq "minimal")) {
27​ } else {
28​ $self->boot_to_login_screen();
29​ }
30​ $self->login_as_root(3);
31​
32​ type_string 'yum -y install fedup; echo $?';
33​ send_key "ret";
34​
35​ assert_screen "console_command_success", 1800;
36​}
37​
38​
39​sub test_flags {
40​ # without anything - rollback to 'lastgood' snapshot if failed
41​ # 'fatal' - whole test suite is in danger if this fails
42​ # 'milestone' - after this test succeeds, update 'lastgood'
43​ # 'important' - if this fails, set the overall state to 'fail'
44​ return { fatal => 1 };
45​}
46​
47​1;
48​
49​# vim: set sw=4 et:
View Options

tests/upgrade_preinstall_minimal.pm

  • This file was moved to tests/upgrade_postinstall_desktop.pm.
View Options

tests/upgrade_run.pm

  • This file was moved from tests/upgrade_run_minimal.pm.
Show All 22 Lines5sub run {
23 upload_logs "/var/log/fedup.log"; 23​ upload_logs "/var/log/fedup.log";
24 24​
25 type_string "reboot"; 25​ type_string "reboot";
26 send_key "ret"; 26​ send_key "ret";
27 27​
28 assert_screen "grub_fedup", 30; 28​ assert_screen "grub_fedup", 30;
29 send_key "ret"; 29​ send_key "ret";
30 30​
31​ if (get_var('UPGRADE') eq "desktop") {
32​ assert_screen "graphical_login", 6000;
33​ #} elsif (get_var('UPGRADE' eq "minimal")) {
34​ } else {
31 assert_screen "text_console_login", 6000; 35​ assert_screen "text_console_login", 6000;
32} 36​ }
37​}
33 38​
34 39​
35sub test_flags { 40​sub test_flags {
36 # without anything - rollback to 'lastgood' snapshot if failed 41​ # without anything - rollback to 'lastgood' snapshot if failed
37 # 'fatal' - whole test suite is in danger if this fails 42​ # 'fatal' - whole test suite is in danger if this fails
38 # 'milestone' - after this test succeeds, update 'lastgood' 43​ # 'milestone' - after this test succeeds, update 'lastgood'
39 # 'important' - if this fails, set the overall state to 'fail' 44​ # 'important' - if this fails, set the overall state to 'fail'
40 return { fatal => 1 }; 45​ return { fatal => 1 };
41} 46​}
42 47​
431; 48​1;
44 49​
45# vim: set sw=4 et: 50​# vim: set sw=4 et:
View Options

tests/upgrade_run_minimal.pm

  • This file was moved to tests/upgrade_run.pm.