Differential D460

fix use of console in anaconda
AbandonedPublic
Actions

Authored by adamwill on Jul 21 2015, 3:53 AM.

Details

Reviewers
garretraziel
jskladan
Summary

This got broken by RHBZ #1222413. Fix that, and while we're at
it, make a method for getting a console in anaconda and re-use
it in a couple of other places.

I first tried to make a sort of all-singing, all-dancing tower
of methods for switching to a console and logging in that took
parameters for tty and user and password and handled both
anaconda and installed system cases, but it rapidly got messy
and unwieldy, so let's keep it simple.

This fiddles with the various needles for 'are we at a root
console?' just enough to make the tests work again, I'm planning
a follow-up commit to remove the duplication (I think just one
sufficiently careful needle should cover all cases).

Test Plan

Run a test suite; a couple more tests (which change software
source and then check it at the console) ought to pass. Also
make sure other root console cases (failure reporting)
continue to work (ideally both live and non-live).

Diff Detail

Repository
rOPENQATESTS os-autoinst-distri-fedora
Branch
console
Lint
No Linters Available
Unit
No Unit Test Coverage
Build Status
Buildable 20
Build 20: arc lint + arc unit
adamwill retitled this revision from to fix use of console in anaconda.Jul 21 2015, 3:53 AM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
garretraziel added a comment.Jul 21 2015, 12:42 PM

Other than the comment, LGTM.

lib/anacondalog.pm
42

I have made similar (but not the same) functionality for installed system here https://bitbucket.org/rajcze/openqa_fedora/src/2e4c1c2325357068e8f2cb79bd545fa969727599/lib/fedoralog.pm?at=develop#fedoralog.pm-6. I wonder if we could (and should) merge all this functionality into one big parent class someday.

garretraziel accepted this revision.Jul 21 2015, 12:43 PM
This revision is now accepted and ready to land.Jul 21 2015, 12:43 PM
adamwill added inline comments.Jul 21 2015, 3:13 PM
lib/anacondalog.pm
42

Like I said, I started out trying to write something clever that would replace that too but it rapidly got messy - it had a method for switching to a specified VT which returned 1 if it found a login prompt and 2 if it found a logged-in screen, a method for trying several VTs until one worked, a big ugly method with parameters for username, password, tty and 'check' with lots of conditionals...it was just kind of a mess. So I thought let's go the other route and just keep it simple.

If we're being organized we might want to come up with a standard approach to extended 'test API' stuff like this and make sure both base classes (anacondalog and fedoralog) follow them (and maybe rename anacondalog and fedoralog - they're effectively our base classes for during-install tests and outside-install tests respectively, but the names don't help much), but I think those two base classes existing does mostly make sense. Perhaps we could add one more level and have them inherit from a shared parent class where we could put things outside the basetest API that all Fedora tests would share...

adamwill added a comment.Jul 22 2015, 12:30 AM

I've submitted a kinda alternative, more extensive version as D462, which I prefer. Leaving this open for now just in case anyone hates D462, but I think it's better.

adamwill abandoned this revision.Jul 22 2015, 6:38 PM

We went with D462 instead.

Revision Contents

Diff 1215

View Options

lib/anacondalog.pm

1package anacondalog; 1​package anacondalog;
2use base 'basetest'; 2​use base 'basetest';
3 3​
4use testapi; 4​use testapi;
5 5​
6sub post_fail_hook { 6​sub post_fail_hook {
7 my $self = shift; 7​ my $self = shift;
8 8​
9 my $has_traceback = 0; 9​ my $has_traceback = 0;
10 if (check_screen "anaconda_error", 10) { 10​ if (check_screen "anaconda_error", 10) {
11 assert_and_click "anaconda_report_btn"; # Generage Anaconda ABRT logs 11​ assert_and_click "anaconda_report_btn"; # Generage Anaconda ABRT logs
12 $has_traceback = 1; 12​ $has_traceback = 1;
13 } 13​ }
14 14​
15 send_key "ctrl-alt-f2"; 15​ anaconda_console(0);
16 my $logged_in = 0; 16​ if (check_screen "root_console", 10) {
17 if (get_var("LIVE") && check_screen "text_console_login", 20) { ​
18 # On live installs, we need to log in ​
19 type_string "root"; ​
20 send_key "ret"; ​
21 if (check_screen "root_logged_in", 10) { ​
22 $logged_in = 1; ​
23 } ​
24 } ​
25 elsif (check_screen "anaconda_console", 10) { ​
26 $logged_in = 1; ​
27 } ​
28 ​
29 if ($logged_in == 1) { ​
30 upload_logs "/tmp/X.log"; 17​ upload_logs "/tmp/X.log";
31 upload_logs "/tmp/anaconda.log"; 18​ upload_logs "/tmp/anaconda.log";
32 upload_logs "/tmp/packaging.log"; 19​ upload_logs "/tmp/packaging.log";
33 upload_logs "/tmp/storage.log"; 20​ upload_logs "/tmp/storage.log";
34 upload_logs "/tmp/syslog"; 21​ upload_logs "/tmp/syslog";
35 upload_logs "/tmp/program.log"; 22​ upload_logs "/tmp/program.log";
36 upload_logs "/tmp/dnf.log"; 23​ upload_logs "/tmp/dnf.log";
37 24​
Show All 9 Lines
47 send_key "ret"; 34​ send_key "ret";
48 upload_logs "/tmp/anaconda_tb.tar.gz"; 35​ upload_logs "/tmp/anaconda_tb.tar.gz";
49 } 36​ }
50 else { 37​ else {
51 save_screenshot; 38​ save_screenshot;
52 } 39​ }
53} 40​}
54 41​
42​sub anaconda_console($) {
garretrazielUnsubmitted
Not Done

I have made similar (but not the same) functionality for installed system here https://bitbucket.org/rajcze/openqa_fedora/src/2e4c1c2325357068e8f2cb79bd545fa969727599/lib/fedoralog.pm?at=develop#fedoralog.pm-6. I wonder if we could (and should) merge all this functionality into one big parent class someday.

adamwillAuthorUnsubmitted
Not Done

Like I said, I started out trying to write something clever that would replace that too but it rapidly got messy - it had a method for switching to a specified VT which returned 1 if it found a login prompt and 2 if it found a logged-in screen, a method for trying several VTs until one worked, a big ugly method with parameters for username, password, tty and 'check' with lots of conditionals...it was just kind of a mess. So I thought let's go the other route and just keep it simple.

If we're being organized we might want to come up with a standard approach to extended 'test API' stuff like this and make sure both base classes (anacondalog and fedoralog) follow them (and maybe rename anacondalog and fedoralog - they're effectively our base classes for during-install tests and outside-install tests respectively, but the names don't help much), but I think those two base classes existing does mostly make sense. Perhaps we could add one more level and have them inherit from a shared parent class where we could put things outside the basetest API that all Fedora tests would share...

43​ my ($self, $check) = @_;
44​ $check ||= 1;
45​ if (get_var("LIVE")) {
46​ send_key "ctrl-alt-f2";
47​ check_screen "text_console_login", 20 && type_string "root\n";
48​ }
49​ else {
50​ # Working around RHBZ 1222413, no console on tty2
51​ send_key "ctrl-alt-f1";
52​ sleep 1;
53​ send_key "alt-tab";
54​ }
55​ $check && assert_screen "root_console", 10;
56​}
57​
551; 58​1;
56 59​
57# vim: set sw=4 et: 60​# vim: set sw=4 et:
58 61​
View Options

needles/anaconda_console.json

1{ 1​{
2 "tags": [ 2​ "tags": [
3 "anaconda_console", 3​ "anaconda_console",
4​ "root_console",
4 "ENV-DISTRI-fedora", 5​ "ENV-DISTRI-fedora",
5 "ENV-INSTLANG-en_US", 6​ "ENV-INSTLANG-en_US",
6 "ENV-OFW-1", 7​ "ENV-OFW-1",
7 "ENV-FLAVOR-server" 8​ "ENV-FLAVOR-server"
8 ], 9​ ],
9 "area": [ 10​ "area": [
10 { 11​ {
11 "xpos": 0, 12​ "xpos": 0,
Show All 15 Lines
View Options

needles/root_logged_in.json

1{ 1​{
2 "properties": [], ​
3 "area": [ 2​ "area": [
4 { 3​ {
5 "width": 156, 4​ "height": 17,
6 "xpos": 0, 5​ "type": "match",
7 "height": 19, 6​ "width": 40,
8 "ypos": 113, 7​ "xpos": 7,
9 "type": "match" 8​ "ypos": 111
9​ },
10​ {
11​ "height": 14,
12​ "type": "match",
13​ "width": 17,
14​ "xpos": 137,
15​ "ypos": 112
10 } 16​ }
11 ], 17​ ],
18​ "properties": [],
12 "tags": [ 19​ "tags": [
13 "root_logged_in", 20​ "root_logged_in",
21​ "root_console",
14 "ENV-DISTRI-fedora", 22​ "ENV-DISTRI-fedora",
15 "ENV-INSTLANG-en_US", 23​ "ENV-INSTLANG-en_US",
16 "ENV-FLAVOR-server" 24​ "ENV-FLAVOR-server"
17 ] 25​ ]
18} 26​}
19No newline at end of file 27​No newline at end of file
View Options

needles/root_logged_in_rawhide20150311.json

1{ 1​{
2​ "area": [
3​ {
4​ "height": 14,
5​ "type": "match",
6​ "width": 41,
7​ "xpos": 7,
8​ "ypos": 80
9​ },
10​ {
11​ "height": 14,
12​ "type": "match",
13​ "width": 16,
14​ "xpos": 136,
15​ "ypos": 80
16​ }
17​ ],
2 "tags": [ 18​ "tags": [
3 "root_logged_in", 19​ "root_logged_in",
20​ "root_console",
4 "ENV-DISTRI-fedora", 21​ "ENV-DISTRI-fedora",
5 "ENV-INSTLANG-en_US", 22​ "ENV-INSTLANG-en_US",
6 "ENV-FLAVOR-server" 23​ "ENV-FLAVOR-server"
7 ], ​
8 "area": [ ​
9 { ​
10 "xpos": 0, ​
11 "ypos": 80, ​
12 "width": 152, ​
13 "height": 14, ​
14 "type": "match" ​
15 } ​
16 ] 24​ ]
17} 25​}
View Options

tests/install_source_graphical.pm

1use base "anacondalog"; 1​use base "anacondalog";
2use strict; 2​use strict;
3use testapi; 3​use testapi;
4 4​
5sub run { 5​sub run {
6​ my $self = shift;
6 # Anaconda hub 7​ # Anaconda hub
7 assert_screen "anaconda_main_hub", 300; # 8​ assert_screen "anaconda_main_hub", 300; #
8 9​
9 # Go into the Install Source spoke 10​ # Go into the Install Source spoke
10 assert_and_click "anaconda_main_hub_installation_source"; 11​ assert_and_click "anaconda_main_hub_installation_source";
11 12​
12 13​
13 14​
Show All 29 Lines
43 } 44​ }
44 45​
45 assert_and_click "anaconda_spoke_done"; 46​ assert_and_click "anaconda_spoke_done";
46 47​
47 # Anaconda hub 48​ # Anaconda hub
48 assert_screen "anaconda_main_hub", 300; 49​ assert_screen "anaconda_main_hub", 300;
49 50​
50 # check that the repo was used 51​ # check that the repo was used
51 send_key "ctrl-alt-f2"; 52​ $self->anaconda_console;
52 wait_idle 10; ​
53 type_string "grep \"".$repourl."\" /tmp/packaging.log"; # | grep \"added repo\""; 53​ type_string "grep \"".$repourl."\" /tmp/packaging.log"; # | grep \"added repo\"";
54 send_key "ret"; 54​ send_key "ret";
55 assert_screen "anaconda_install_source_check_repo_added"; 55​ assert_screen "anaconda_install_source_check_repo_added";
56 send_key "ctrl-alt-f6"; 56​ send_key "ctrl-alt-f6";
57 57​
58 # Anaconda hub 58​ # Anaconda hub
59 assert_screen "anaconda_main_hub", 30; # 59​ assert_screen "anaconda_main_hub", 30; #
60 60​
Show All 13 Lines
View Options

tests/install_source_variation.pm

1use base "anacondalog"; 1​use base "anacondalog";
2use strict; 2​use strict;
3use testapi; 3​use testapi;
4 4​
5sub run { 5​sub run {
6 # !!! GRUB parameter is set in _boot_to_anaconda.pm !!! 6​ # !!! GRUB parameter is set in _boot_to_anaconda.pm !!!
7 7​ my $self = shift;
8 # Anaconda hub 8​ # Anaconda hub
9 assert_screen "anaconda_main_hub"; 9​ assert_screen "anaconda_main_hub";
10 10​
11 # FIXME: this code is scattered in at least three places (here, _boot_to_anaconda, _install_source_graphical. Deduplicate 11​ # FIXME: this code is scattered in at least three places (here, _boot_to_anaconda, _install_source_graphical. Deduplicate
12 my $fedora_version = lc((split /_/, get_var("BUILD"))[0]); 12​ my $fedora_version = lc((split /_/, get_var("BUILD"))[0]);
13 my $repourl = ""; 13​ my $repourl = "";
14 14​
15 $repourl = get_var("REPOSITORY_VARIATION")."/".$fedora_version."/".get_var("ARCH")."/os"; 15​ $repourl = get_var("REPOSITORY_VARIATION")."/".$fedora_version."/".get_var("ARCH")."/os";
16 16​
17 # check that the repo was used 17​ # check that the repo was used
18 send_key "ctrl-alt-f2"; 18​ $self->anaconda_console();
19 wait_idle 10; ​
20 type_string "grep \"".$repourl."\" /tmp/packaging.log"; #| grep \"added repo\""; 19​ type_string "grep \"".$repourl."\" /tmp/packaging.log"; #| grep \"added repo\"";
21 send_key "ret"; 20​ send_key "ret";
22 assert_screen "anaconda_install_source_check_repo_added"; 21​ assert_screen "anaconda_install_source_check_repo_added";
23 send_key "ctrl-alt-f6"; 22​ send_key "ctrl-alt-f6";
24 23​
25 # Anaconda hub 24​ # Anaconda hub
26 assert_screen "anaconda_main_hub", 30; # 25​ assert_screen "anaconda_main_hub", 30; #
27 26​
Show All 13 Lines