Use validate_script_output and regex matching instead
of type_string and needles.
Run all the tests.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
OK overall, just please use $_ explicitly, where possible. kthxbai!
| lib/installedtest.pm | ||
|---|---|---|
| 27–32 | comment pls | |
| Commit | Tree | Parents | Author | Summary | Date |
|---|---|---|---|---|---|
| abeaf9a864d1 | 9c748751ca9a | 7a4eff8acb2a | Jan Sedlák | use validate_script_output instead of typing and needles matching (Show More…) | Oct 22 2015, 1:17 PM |
| 1 | package anacondatest; | 1 | package anacondatest; | ||
|---|---|---|---|---|---|
| 2 | use base 'fedorabase'; | 2 | use base 'fedorabase'; | ||
| 3 | 3 | | |||
| 4 | # base class for all Anaconda (installation) tests | 4 | # base class for all Anaconda (installation) tests | ||
| 5 | 5 | | |||
| 6 | # should be used in tests where Anaconda is running - when it makes sense | 6 | # should be used in tests where Anaconda is running - when it makes sense | ||
| 7 | # to upload Anaconda logs when something fails | 7 | # to upload Anaconda logs when something fails | ||
| 8 | 8 | | |||
| 9 | use testapi; | 9 | use testapi; | ||
| 10 | 10 | | |||
| 11 | sub post_fail_hook { | 11 | sub post_fail_hook { | ||
| 12 | my $self = shift; | 12 | my $self = shift; | ||
| 13 | 13 | | |||
| 14 | # if error dialog is shown, click "report" - it then creates directory structure for ABRT | 14 | # if error dialog is shown, it created traceback file | ||
| 15 | my $has_traceback = 0; | 15 | my $has_traceback = 0; | ||
| 16 | if (check_screen "anaconda_error", 10) { | 16 | if (check_screen "anaconda_error", 10) { | ||
| 17 | assert_and_click "anaconda_report_btn"; # Generage Anaconda ABRT logs | | |||
| 18 | $has_traceback = 1; | 17 | $has_traceback = 1; | ||
| 19 | } | 18 | } | ||
| 20 | 19 | | |||
| 21 | $self->root_console(check=>0); | 20 | $self->root_console(check=>0); | ||
| 22 | if (check_screen "root_console", 10) { | 21 | if (check_screen "root_console", 10) { | ||
| 23 | upload_logs "/tmp/X.log"; | 22 | upload_logs "/tmp/X.log"; | ||
| 24 | upload_logs "/tmp/anaconda.log"; | 23 | upload_logs "/tmp/anaconda.log"; | ||
| 25 | upload_logs "/tmp/packaging.log"; | 24 | upload_logs "/tmp/packaging.log"; | ||
| 26 | upload_logs "/tmp/storage.log"; | 25 | upload_logs "/tmp/storage.log"; | ||
| 27 | upload_logs "/tmp/syslog"; | 26 | upload_logs "/tmp/syslog"; | ||
| 28 | upload_logs "/tmp/program.log"; | 27 | upload_logs "/tmp/program.log"; | ||
| 29 | upload_logs "/tmp/dnf.log"; | 28 | upload_logs "/tmp/dnf.log"; | ||
| 30 | upload_logs "/tmp/dnf.librepo.log"; | 29 | upload_logs "/tmp/dnf.librepo.log"; | ||
| 31 | upload_logs "/tmp/dnf.rpm.log"; | 30 | upload_logs "/tmp/dnf.rpm.log"; | ||
| 32 | 31 | | |||
| 33 | # Upload all ABRT logs | | |||
| 34 | if ($has_traceback) { | 32 | if ($has_traceback) { | ||
| 35 | type_string "cd /var/tmp && tar czvf var_tmp.tar.gz *"; | | |||
| 36 | send_key "ret"; | | |||
| 37 | upload_logs "/var/tmp/var_tmp.tar.gz"; | | |||
| 38 | } | | |||
| 39 | | ||||
| 40 | # Upload Anaconda traceback logs | 33 | # Upload Anaconda traceback logs | ||
| 41 | type_string "tar czvf /tmp/anaconda_tb.tar.gz /tmp/anaconda-tb-*"; | 34 | script_run "tar czf /tmp/anaconda_tb.tar.gz /tmp/anaconda-tb-*"; | ||
| 42 | send_key "ret"; | | |||
| 43 | upload_logs "/tmp/anaconda_tb.tar.gz"; | 35 | upload_logs "/tmp/anaconda_tb.tar.gz"; | ||
| 44 | } | 36 | } | ||
| 37 | | ||||
| 38 | # Upload all ABRT logs | ||||
| 39 | script_run "tar czf var_tmp.tar.gz /var/tmp"; | ||||
| 40 | upload_logs "/var/tmp/var_tmp.tar.gz"; | ||||
| 41 | | ||||
| 42 | # Upload /var/log | ||||
| 43 | script_run "tar czf /tmp/var_log.tar.gz /var/log"; | ||||
| 44 | upload_logs "/tmp/var_log.tar.gz"; | ||||
| 45 | } | ||||
| 45 | else { | 46 | else { | ||
| 46 | save_screenshot; | 47 | save_screenshot; | ||
| 47 | } | 48 | } | ||
| 48 | } | 49 | } | ||
| 49 | 50 | | |||
| 50 | sub root_console { | 51 | sub root_console { | ||
| 51 | my $self = shift; | 52 | my $self = shift; | ||
| 52 | my %args = ( | 53 | my %args = ( | ||
| ▲ Show 20 Lines • Show All 89 Lines • Show Last 20 Lines | |||||
| Show All 40 Lines | 33 | for my $n (1 .. 10) { | |||
|---|---|---|---|---|---|
| 41 | # is displayed (as the login prompt is still visible), and | 41 | # is displayed (as the login prompt is still visible), and | ||
| 42 | # both still match after login is complete, unless something | 42 | # both still match after login is complete, unless something | ||
| 43 | # runs 'clear'. The sleeps and $needuser / $needpass attempt | 43 | # runs 'clear'. The sleeps and $needuser / $needpass attempt | ||
| 44 | # to mitigate these problems. | 44 | # to mitigate these problems. | ||
| 45 | if (check_screen $good, 0) { | 45 | if (check_screen $good, 0) { | ||
| 46 | return; | 46 | return; | ||
| 47 | } | 47 | } | ||
| 48 | elsif (check_screen $bad, 0) { | 48 | elsif (check_screen $bad, 0) { | ||
| 49 | type_string "exit\n"; | 49 | script_run "exit"; | ||
| 50 | sleep 2; | 50 | sleep 2; | ||
| 51 | } | 51 | } | ||
| 52 | if ($needuser and check_screen "text_console_login", 0) { | 52 | if ($needuser and check_screen "text_console_login", 0) { | ||
| 53 | type_string "$args{user}\n"; | 53 | type_string "$args{user}\n"; | ||
| 54 | $needuser = 0; | 54 | $needuser = 0; | ||
| 55 | sleep 2; | 55 | sleep 2; | ||
| 56 | } | 56 | } | ||
| 57 | elsif ($needpass and check_screen "console_password_required", 0) { | 57 | elsif ($needpass and check_screen "console_password_required", 0) { | ||
| Show All 28 Lines | |||||
| Show All 27 Lines | 27 | sub x11_start_program($$$) { | |||
|---|---|---|---|---|---|
| 28 | my ($self, $program, $timeout, $options) = @_; | 28 | my ($self, $program, $timeout, $options) = @_; | ||
| 29 | send_key "alt-f2"; | 29 | send_key "alt-f2"; | ||
| 30 | assert_screen "desktop_runner"; | 30 | assert_screen "desktop_runner"; | ||
| 31 | type_string $program; | 31 | type_string $program; | ||
| 32 | wait_idle 5; # because of KDE dialog - SUSE guys are doing the same! | 32 | wait_idle 5; # because of KDE dialog - SUSE guys are doing the same! | ||
| 33 | send_key "ret", 1; | 33 | send_key "ret", 1; | ||
| 34 | } | 34 | } | ||
| 35 | 35 | | |||
| 36 | sub script_run { | ||||
| 37 | my ($self, $program, $timeout) = @_; | ||||
| 38 | | ||||
| 39 | type_string $program; | ||||
| 40 | send_key "ret", $timeout; | ||||
| 41 | } | ||||
| 42 | | ||||
| 36 | 1; | 43 | 1; | ||
| 37 | # vim: set sw=4 et: | 44 | # vim: set sw=4 et: | ||
| Show All 18 Lines | 11 | sub root_console { | |||
|---|---|---|---|---|---|
| 19 | $self->console_login(check=>$args{check}); | 19 | $self->console_login(check=>$args{check}); | ||
| 20 | } | 20 | } | ||
| 21 | 21 | | |||
| 22 | sub post_fail_hook { | 22 | sub post_fail_hook { | ||
| 23 | my $self = shift; | 23 | my $self = shift; | ||
| 24 | 24 | | |||
| 25 | $self->root_console(tty=>2); | 25 | $self->root_console(tty=>2); | ||
| 26 | 26 | | |||
| 27 | # If /var/tmp/abrt directory isn't empty (ls doesn't return empty string) | ||||
| 28 | if (validate_script_output "ls /var/tmp/abrt", sub { $_ ne '' }) { | ||||
| 27 | # Upload all ABRT logs | 29 | # Upload all ABRT logs | ||
| 28 | type_string "cd /var/tmp/abrt && tar czvf abrt.tar.gz *"; | 30 | script_run "cd /var/tmp/abrt && tar czvf abrt.tar.gz *"; | ||
| 29 | send_key "ret"; | | |||
| 30 | upload_logs "/var/tmp/abrt/abrt.tar.gz"; | 31 | upload_logs "/var/tmp/abrt/abrt.tar.gz"; | ||
| 32 | } | ||||
| 31 | 33 | | |||
| 32 | # Upload /var/log | 34 | # Upload /var/log | ||
| 33 | type_string "tar czvf /tmp/var_log.tar.gz /var/log"; | 35 | script_run "tar czvf /tmp/var_log.tar.gz /var/log"; | ||
| 34 | send_key "ret"; | | |||
| 35 | upload_logs "/tmp/var_log.tar.gz"; | 36 | upload_logs "/tmp/var_log.tar.gz"; | ||
| 36 | } | 37 | } | ||
| 37 | 38 | | |||
| 38 | sub check_release { | 39 | sub check_release { | ||
| 39 | my $self = shift; | 40 | my $self = shift; | ||
| 40 | my $release = shift; | 41 | my $release = shift; | ||
| 41 | type_string "clear\n"; | 42 | my $check_command = "grep SUPPORT_PRODUCT_VERSION /usr/lib/os.release.d/os-release-fedora"; | ||
| 42 | type_string "grep SUPPORT_PRODUCT_VERSION /usr/lib/os.release.d/os-release-fedora | grep -q ${release}\n"; | 43 | validate_script_output $check_command, sub { $_ =~ m/REDHAT_SUPPORT_PRODUCT_VERSION=$release/ }; | ||
| 43 | type_string "echo \$?\n"; | | |||
| 44 | assert_screen "console_command_success"; | | |||
| 45 | } | 44 | } | ||
| 46 | 45 | | |||
| 47 | 1; | 46 | 1; | ||
| 48 | 47 | | |||
| 49 | # vim: set sw=4 et: | 48 | # vim: set sw=4 et: | ||
| 1 | { | 1 | { | ||
|---|---|---|---|---|---|
| 2 | "area": [ | 2 | "area": [ | ||
| 3 | { | 3 | { | ||
| 4 | "xpos": 275, | 4 | "xpos": 275, | ||
| 5 | "ypos": 319, | 5 | "ypos": 319, | ||
| 6 | "width": 217, | 6 | "width": 217, | ||
| 7 | "height": 19, | 7 | "height": 19, | ||
| 8 | "type": "match" | 8 | "type": "match" | ||
| 9 | }, | | |||
| 10 | { | | |||
| 11 | "xpos": 577, | | |||
| 12 | "ypos": 430, | | |||
| 13 | "width": 89, | | |||
| 14 | "height": 20, | | |||
| 15 | "type": "match" | | |||
| 16 | } | 9 | } | ||
| 17 | ], | 10 | ], | ||
| 18 | "tags": [ | 11 | "tags": [ | ||
| 19 | "ENV-DISTRI-fedora", | 12 | "ENV-DISTRI-fedora", | ||
| 20 | "ENV-FLAVOR-server", | 13 | "ENV-FLAVOR-server", | ||
| 21 | "anaconda_error" | 14 | "anaconda_error" | ||
| 22 | ], | 15 | ], | ||
| 23 | "properties": [] | 16 | "properties": [] | ||
| 24 | } | 17 | } | ||
| This file was completely deleted. Show File Contents |
| This file was completely deleted. Show File Contents |
| This file was completely deleted. Show File Contents |
| This file was completely deleted. Show File Contents |
| This file was completely deleted. Show File Contents |
comment pls