Differential D1034

drop our implementation of script_run in favour of os-autoinst
ClosedPublic
Actions

Authored by adamwill on Oct 18 2016, 8:41 PM.

Details

Reviewers
garretraziel
jskladan
Commits
rOPENQATESTSdcb68d93c848: drop our implementation of script_run in favour of os-autoinst
Summary

os-autoinst implements script_run itself now, we aren't
required to implement it ourselves any more. os-autoinst's
implementation is better than ours, as it allows for verifying
the script actually ran (via the redirect-output-to-serial-
console trick).

So this drops our implementation so we'll just use the upstream
one. Where I judged we don't want to bother with the 'check
the command actually ran' feature I've adjusted our direct
script_run calls to pass a wait time of 0, which skips the
'wait for command to run' stuff entirely and just does a simple
'type the string and hit enter'.

Because of how the inheritance works, our assert_script_run
calls already used the os-autoinst script_run, rather than
the one from our distribution.

This should prevent prepare_test_packages sometimes going
wrong right after removing the python3-kickstart package, as
we'll properly wait for that removal to complete now (before
we weren't, we'd just start typing the next command while it
was still running, which could result in lost keypresses).

Test Plan

Check all tests still run OK (I've tried this on
staging and it seems fine).

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 drop our implementation of script_run in favour of os-autoinst.Oct 18 2016, 8:41 PM
adamwill updated this object.
adamwill edited the test plan for this revision. (Show Details)
adamwill added reviewers: jskladan, garretraziel.
garretraziel accepted this revision.Oct 20 2016, 1:46 PM
This revision is now accepted and ready to land.Oct 20 2016, 1:46 PM
Closed by commit rOPENQATESTSdcb68d93c848: drop our implementation of script_run in favour of os-autoinst (authored by adamwill). · Explain WhyOct 20 2016, 4:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

Diff 2645

View Options

lib/anacondatest.pm

Show All 30 Lines12sub post_fail_hook {
31 upload_logs "/tmp/syslog", failok=>1; 31​ upload_logs "/tmp/syslog", failok=>1;
32 upload_logs "/tmp/program.log", failok=>1; 32​ upload_logs "/tmp/program.log", failok=>1;
33 upload_logs "/tmp/dnf.log", failok=>1; 33​ upload_logs "/tmp/dnf.log", failok=>1;
34 upload_logs "/tmp/dnf.librepo.log", failok=>1; 34​ upload_logs "/tmp/dnf.librepo.log", failok=>1;
35 upload_logs "/tmp/dnf.rpm.log", failok=>1; 35​ upload_logs "/tmp/dnf.rpm.log", failok=>1;
36 36​
37 if ($has_traceback) { 37​ if ($has_traceback) {
38 # Upload Anaconda traceback logs 38​ # Upload Anaconda traceback logs
39 script_run "tar czf /tmp/anaconda_tb.tar.gz /tmp/anaconda-tb-*"; 39​ script_run "tar czf /tmp/anaconda_tb.tar.gz /tmp/anaconda-tb-*", 0;
40 upload_logs "/tmp/anaconda_tb.tar.gz"; 40​ upload_logs "/tmp/anaconda_tb.tar.gz";
41 } 41​ }
42 42​
43 # Upload all ABRT logs 43​ # Upload all ABRT logs
44 script_run "tar czf /var/tmp/var_tmp.tar.gz /var/tmp"; 44​ script_run "tar czf /var/tmp/var_tmp.tar.gz /var/tmp", 0;
45 upload_logs "/var/tmp/var_tmp.tar.gz"; 45​ upload_logs "/var/tmp/var_tmp.tar.gz";
46 46​
47 # Upload /var/log 47​ # Upload /var/log
48 script_run "tar czf /tmp/var_log.tar.gz /var/log"; 48​ script_run "tar czf /tmp/var_log.tar.gz /var/log", 0;
49 upload_logs "/tmp/var_log.tar.gz"; 49​ upload_logs "/tmp/var_log.tar.gz";
50 50​
51 # Upload anaconda core dump, if there is one 51​ # Upload anaconda core dump, if there is one
52 script_run "ls /tmp/anaconda.core.* && tar czf /tmp/anaconda.core.tar.gz /tmp/anaconda.core.*"; 52​ script_run "ls /tmp/anaconda.core.* && tar czf /tmp/anaconda.core.tar.gz /tmp/anaconda.core.*", 0;
53 upload_logs "/tmp/anaconda.core.tar.gz", failok=>1; 53​ upload_logs "/tmp/anaconda.core.tar.gz", failok=>1;
54} 54​}
55 55​
56sub root_console { 56​sub root_console {
57 my $self = shift; 57​ my $self = shift;
58 my %args = ( 58​ my %args = (
59 @_); 59​ @_);
60 60​
▲ Show 20 Lines • Show All 147 Lines • Show Last 20 Lines
View Options

lib/fedoradistribution.pm

1package fedoradistribution; 1​package fedoradistribution;
2use base 'distribution'; 2​use base 'distribution';
3 3​
4# Fedora distribution class 4​# Fedora distribution class
5 5​
6# Distro-specific functions, that are actually part of the API 6​# Distro-specific functions, that are actually part of the API
7# (and it's completely up to us to implement them) should be here 7​# (and it's completely up to us to implement them) should be here
8 8​
9# functions that can be reimplemented: 9​# functions that can be reimplemented:
10# ensure_installed 10​# ensure_installed
11# x11_start_program 11​# x11_start_program
12# become_root 12​# become_root
13# script_run ​
14# script_sudo 13​# script_sudo
15# type_password 14​# type_password
16 15​
17# importing whole testapi creates circular dependency, so import inly 16​# importing whole testapi creates circular dependency, so import only
18# necessary functions from testapi 17​# necessary functions from testapi
19use testapi qw(send_key type_string wait_idle assert_screen); 18​use testapi qw(send_key type_string wait_idle assert_screen);
20 19​
21sub init() { 20​sub init() {
22 my ($self) = @_; 21​ my ($self) = @_;
23 22​
24 $self->SUPER::init(); 23​ $self->SUPER::init();
25} 24​}
26 25​
27sub x11_start_program { 26​sub x11_start_program {
28 my ($self, $program, $timeout, $options) = @_; 27​ my ($self, $program, $timeout, $options) = @_;
29 send_key "alt-f2"; 28​ send_key "alt-f2";
30 assert_screen "desktop_runner"; 29​ assert_screen "desktop_runner";
31 type_string $program, 20; 30​ type_string $program, 20;
32 wait_idle 5; # because of KDE dialog - SUSE guys are doing the same! 31​ wait_idle 5; # because of KDE dialog - SUSE guys are doing the same!
33 send_key "ret", 1; 32​ send_key "ret", 1;
34} 33​}
35 34​
36sub script_run { ​
37 my ($self, $program, $timeout) = @_; ​
38 ​
39 type_string $program; ​
40 send_key "ret", $timeout; ​
41} ​
42 ​
431; 35​1;
44# vim: set sw=4 et: 36​# vim: set sw=4 et:
View Options

lib/installedtest.pm

Show All 22 Lines22sub post_fail_hook {
23 my $self = shift; 23​ my $self = shift;
24 24​
25 $self->root_console(tty=>6); 25​ $self->root_console(tty=>6);
26 26​
27 # If /var/tmp/abrt directory isn't empty (ls doesn't return empty string) 27​ # If /var/tmp/abrt directory isn't empty (ls doesn't return empty string)
28 my $vartmp = script_output "ls /var/tmp/abrt"; 28​ my $vartmp = script_output "ls /var/tmp/abrt";
29 if ($vartmp ne '') { 29​ if ($vartmp ne '') {
30 # Upload /var/tmp ABRT logs 30​ # Upload /var/tmp ABRT logs
31 script_run "cd /var/tmp/abrt && tar czvf tmpabrt.tar.gz *"; 31​ script_run "cd /var/tmp/abrt && tar czvf tmpabrt.tar.gz *", 0;
32 upload_logs "/var/tmp/abrt/tmpabrt.tar.gz"; 32​ upload_logs "/var/tmp/abrt/tmpabrt.tar.gz";
33 } 33​ }
34 my $varspool = script_output "ls /var/spool/abrt"; 34​ my $varspool = script_output "ls /var/spool/abrt";
35 if ($varspool ne '') { 35​ if ($varspool ne '') {
36 # Upload /var/spool ABRT logs 36​ # Upload /var/spool ABRT logs
37 script_run "cd /var/spool/abrt && tar czvf spoolabrt.tar.gz *"; 37​ script_run "cd /var/spool/abrt && tar czvf spoolabrt.tar.gz *", 0;
38 upload_logs "/var/spool/abrt/spoolabrt.tar.gz"; 38​ upload_logs "/var/spool/abrt/spoolabrt.tar.gz";
39 } 39​ }
40 40​
41 # Upload /var/log 41​ # Upload /var/log
42 # lastlog can mess up tar sometimes and it's not much use 42​ # lastlog can mess up tar sometimes and it's not much use
43 script_run "tar czvf /tmp/var_log.tar.gz --exclude='lastlog' /var/log"; 43​ script_run "tar czvf /tmp/var_log.tar.gz --exclude='lastlog' /var/log", 0;
44 upload_logs "/tmp/var_log.tar.gz"; 44​ upload_logs "/tmp/var_log.tar.gz";
45} 45​}
46 46​
47sub check_release { 47​sub check_release {
48 my $self = shift; 48​ my $self = shift;
49 my $release = shift; 49​ my $release = shift;
50 my $check_command = "grep SUPPORT_PRODUCT_VERSION /usr/lib/os.release.d/os-release-fedora"; 50​ my $check_command = "grep SUPPORT_PRODUCT_VERSION /usr/lib/os.release.d/os-release-fedora";
51 validate_script_output $check_command, sub { $_ =~ m/REDHAT_SUPPORT_PRODUCT_VERSION=$release/ }; 51​ validate_script_output $check_command, sub { $_ =~ m/REDHAT_SUPPORT_PRODUCT_VERSION=$release/ };
Show All 33 Lines84sub repo_setup {
85 # disable updates-testing and use the compose location rather than 85​ # disable updates-testing and use the compose location rather than
86 # mirrorlist, so we're testing the right packages 86​ # mirrorlist, so we're testing the right packages
87 my $location = get_var("LOCATION"); 87​ my $location = get_var("LOCATION");
88 assert_script_run 'dnf config-manager --set-disabled updates-testing'; 88​ assert_script_run 'dnf config-manager --set-disabled updates-testing';
89 # we use script_run here as the rawhide repo file won't always exist 89​ # we use script_run here as the rawhide repo file won't always exist
90 # and we don't want to bother testing or predicting its existence; 90​ # and we don't want to bother testing or predicting its existence;
91 # assert_script_run doesn't buy you much with sed anyway as it'll 91​ # assert_script_run doesn't buy you much with sed anyway as it'll
92 # return 0 even if it replaced nothing 92​ # return 0 even if it replaced nothing
93 script_run "sed -i -e 's,^metalink,#metalink,g' -e 's,^#baseurl.*basearch,baseurl=${location}/Everything/\$basearch,g' /etc/yum.repos.d/{fedora,fedora-rawhide}.repo"; 93​ script_run "sed -i -e 's,^metalink,#metalink,g' -e 's,^#baseurl.*basearch,baseurl=${location}/Everything/\$basearch,g' /etc/yum.repos.d/{fedora,fedora-rawhide}.repo", 0;
94 script_run "cat /etc/yum.repos.d/{fedora,fedora-rawhide}.repo"; 94​ script_run "cat /etc/yum.repos.d/{fedora,fedora-rawhide}.repo", 0;
95} 95​}
96 96​
971; 97​1;
98 98​
99# vim: set sw=4 et: 99​# vim: set sw=4 et:
View Options

lib/packagetest.pm

1package packagetest; 1​package packagetest;
2 2​
3use strict; 3​use strict;
4 4​
5use base 'Exporter'; 5​use base 'Exporter';
6use Exporter; 6​use Exporter;
7 7​
8use testapi; 8​use testapi;
9our @EXPORT = qw/prepare_test_packages verify_installed_packages verify_updated_packages/; 9​our @EXPORT = qw/prepare_test_packages verify_installed_packages verify_updated_packages/;
10 10​
11# enable the openqa test package repositories and install the main 11​# enable the openqa test package repositories and install the main
12# test packages, remove python3-kickstart and install the fake one 12​# test packages, remove python3-kickstart and install the fake one
13sub prepare_test_packages { 13​sub prepare_test_packages {
14 # remove python3-kickstart if installed (we don't use assert 14​ # remove python3-kickstart if installed (we don't use assert
15 # here in case it's not) 15​ # here in case it's not)
16 script_run 'dnf -y remove python3-kickstart'; 16​ script_run 'dnf -y remove python3-kickstart', 180;
17 # we seem to often lose keystrokes in the next command if we run 17​ # we seem to often lose keystrokes in the next command if we run
18 # it too fast, let's wait for idle first 18​ # it too fast, let's wait for idle first
19 wait_idle 20; 19​ wait_idle 20;
20 # grab the test repo definitions 20​ # grab the test repo definitions
21 assert_script_run 'curl -o /etc/yum.repos.d/openqa-testrepo-1.repo https://fedorapeople.org/groups/qa/openqa-repos/openqa-testrepo-1.repo'; 21​ assert_script_run 'curl -o /etc/yum.repos.d/openqa-testrepo-1.repo https://fedorapeople.org/groups/qa/openqa-repos/openqa-testrepo-1.repo';
22 # install the test packages from repo1 22​ # install the test packages from repo1
23 assert_script_run 'dnf -y --disablerepo=* --enablerepo=openqa-testrepo-1 install python3-kickstart'; 23​ assert_script_run 'dnf -y --disablerepo=* --enablerepo=openqa-testrepo-1 install python3-kickstart';
24} 24​}
Show All 16 Lines
View Options

tests/base_service_manipulation.pm

1use base "installedtest"; 1​use base "installedtest";
2use strict; 2​use strict;
3use testapi; 3​use testapi;
4use main_common; 4​use main_common;
5 5​
6sub run { 6​sub run {
7 my $self = shift; 7​ my $self = shift;
8 # switch to TTY3 for both, graphical and console tests 8​ # switch to TTY3 for both, graphical and console tests
9 $self->root_console(tty=>3); 9​ $self->root_console(tty=>3);
10 # we could make this slightly more 'efficient' by assuming sshd 10​ # we could make this slightly more 'efficient' by assuming sshd
11 # is always going to be enabled/running at first, but it's safer 11​ # is always going to be enabled/running at first, but it's safer
12 # to force an expected starting state. 12​ # to force an expected starting state.
13 script_run "systemctl stop sshd.service"; 13​ script_run "systemctl stop sshd.service";
14 script_run "systemctl disable sshd.service"; 14​ script_run "systemctl disable sshd.service";
15 script_run "reboot"; 15​ script_run "reboot", 0;
16 boot_to_login_screen; 16​ boot_to_login_screen;
17 $self->root_console(tty=>3); 17​ $self->root_console(tty=>3);
18 # note the use of ! here is a bash-ism, but it sure makes life easier 18​ # note the use of ! here is a bash-ism, but it sure makes life easier
19 assert_script_run '! systemctl is-enabled sshd.service'; 19​ assert_script_run '! systemctl is-enabled sshd.service';
20 assert_script_run '! systemctl is-active sshd.service'; 20​ assert_script_run '! systemctl is-active sshd.service';
21 assert_script_run '! ps -C sshd'; 21​ assert_script_run '! ps -C sshd';
22 script_run "systemctl start sshd.service"; 22​ script_run "systemctl start sshd.service";
23 assert_script_run '! systemctl is-enabled sshd.service'; 23​ assert_script_run '! systemctl is-enabled sshd.service';
24 assert_script_run 'systemctl is-active sshd.service'; 24​ assert_script_run 'systemctl is-active sshd.service';
25 assert_script_run 'ps -C sshd'; 25​ assert_script_run 'ps -C sshd';
26 script_run "systemctl stop sshd.service"; 26​ script_run "systemctl stop sshd.service";
27 assert_script_run '! systemctl is-enabled sshd.service'; 27​ assert_script_run '! systemctl is-enabled sshd.service';
28 assert_script_run '! systemctl is-active sshd.service'; 28​ assert_script_run '! systemctl is-active sshd.service';
29 assert_script_run '! ps -C sshd'; 29​ assert_script_run '! ps -C sshd';
30 script_run "systemctl enable sshd.service"; 30​ script_run "systemctl enable sshd.service";
31 assert_script_run 'systemctl is-enabled sshd.service'; 31​ assert_script_run 'systemctl is-enabled sshd.service';
32 assert_script_run '! systemctl is-active sshd.service'; 32​ assert_script_run '! systemctl is-active sshd.service';
33 assert_script_run '! ps -C sshd'; 33​ assert_script_run '! ps -C sshd';
34 script_run "reboot"; 34​ script_run "reboot", 0;
35 boot_to_login_screen; 35​ boot_to_login_screen;
36 $self->root_console(tty=>3); 36​ $self->root_console(tty=>3);
37 assert_script_run 'systemctl is-enabled sshd.service'; 37​ assert_script_run 'systemctl is-enabled sshd.service';
38 assert_script_run 'systemctl is-active sshd.service'; 38​ assert_script_run 'systemctl is-active sshd.service';
39 assert_script_run 'ps -C sshd'; 39​ assert_script_run 'ps -C sshd';
40 script_run "systemctl disable sshd.service"; 40​ script_run "systemctl disable sshd.service";
41 script_run "reboot"; 41​ script_run "reboot", 0;
42 boot_to_login_screen; 42​ boot_to_login_screen;
43 $self->root_console(tty=>3); 43​ $self->root_console(tty=>3);
44 assert_script_run '! systemctl is-enabled sshd.service'; 44​ assert_script_run '! systemctl is-enabled sshd.service';
45 assert_script_run '! systemctl is-active sshd.service'; 45​ assert_script_run '! systemctl is-active sshd.service';
46 assert_script_run '! ps -C sshd'; 46​ assert_script_run '! ps -C sshd';
47} 47​}
48 48​
49 49​
Show All 11 Lines
View Options

tests/upgrade_preinstall.pm

Show All 12 Lines6sub run {
13 boot_to_login_screen; 13​ boot_to_login_screen;
14 # switch to TTY3 for both, graphical and console tests 14​ # switch to TTY3 for both, graphical and console tests
15 $self->root_console(tty=>3); 15​ $self->root_console(tty=>3);
16 # disable screen blanking (update can take a long time) 16​ # disable screen blanking (update can take a long time)
17 script_run "setterm -blank 0"; 17​ script_run "setterm -blank 0";
18 18​
19 # upgrader should be installed on up-to-date system 19​ # upgrader should be installed on up-to-date system
20 assert_script_run 'dnf -y update', 1800; 20​ assert_script_run 'dnf -y update', 1800;
21 script_run "reboot"; 21​ script_run "reboot", 0;
22 22​
23 # decrypt if necessary 23​ # decrypt if necessary
24 if (get_var("ENCRYPT_PASSWORD")) { 24​ if (get_var("ENCRYPT_PASSWORD")) {
25 $self->boot_decrypt(60); 25​ $self->boot_decrypt(60);
26 } 26​ }
27 27​
28 boot_to_login_screen; 28​ boot_to_login_screen;
29 $self->root_console(tty=>3); 29​ $self->root_console(tty=>3);
Show All 17 Lines