testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

use assert_script_run when possible

Browse Source 
Summary:
D637 / ec6b3ff4 switched from using needle matches to using
validate_script_output when we want to run a console command
and check the result. validate_script_output is kinda over-
powered when all you want to do is check the command succeeded
(returned 0), though. testapi provides assert_script_run for
doing exactly that - it runs a script and fails if the script
fails (returns anything but 0). This gives us cleaner code and
is slightly more robust; validate_script_output uses the mini
web server on the worker, which I've occasionally seen crap
out, so it seems good to avoid using it when possible. assert_
script_run doesn't need it.

Test Plan: Check all (affected) tests still work properly.

Reviewers: jskladan, garretraziel

Reviewed By: jskladan, garretraziel

Subscribers: tflink

Differential Revision: https://phab.qadevel.cloud.fedoraproject.org/D714
This commit is contained in:
Adam Williamson 2016-01-12 09:27:14 -08:00
parent 63e03ecbdf
commit aa20bab713
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/disk_guided_delete_partial_postinstall.pm
View File

@ -5,7 +5,7 @@ use testapi;
sub run { sub run {
assert_screen "root_console"; assert_screen "root_console";
# mount second partition and check that it's intact # mount second partition and check that it's intact
validate_script_output 'mount /dev/vda2 /mnt; echo $?', sub { $_ =~ m/0/ }; assert_script_run 'mount /dev/vda2 /mnt';
validate_script_output 'cat /mnt/testfile', sub { $_ =~ m/Oh, hi Mark/ }; validate_script_output 'cat /mnt/testfile', sub { $_ =~ m/Oh, hi Mark/ };
} }

2
tests/disk_guided_free_space_postinstall.pm
View File

@ -5,7 +5,7 @@ use testapi;
sub run { sub run {
assert_screen "root_console"; assert_screen "root_console";
# check that first partition is intact # check that first partition is intact
validate_script_output 'mount /dev/vda1 /mnt; echo $?', sub { $_ =~ m/0/ }; assert_script_run 'mount /dev/vda1 /mnt';
validate_script_output 'cat /mnt/testfile', sub { $_ =~ m/Hello, world!/ }; validate_script_output 'cat /mnt/testfile', sub { $_ =~ m/Hello, world!/ };
} }

2
tests/disk_guided_multi_postinstall.pm
View File

@ -5,7 +5,7 @@ use testapi;
sub run { sub run {
assert_screen "root_console"; assert_screen "root_console";
# check that second disk is intact # check that second disk is intact
validate_script_output 'mount /dev/sdb1 /mnt; echo $?', sub { $_ =~ m/0/ }; assert_script_run 'mount /dev/sdb1 /mnt';
validate_script_output 'cat /mnt/testfile', sub { $_ =~ m/Hello, world!/ }; validate_script_output 'cat /mnt/testfile', sub { $_ =~ m/Hello, world!/ };
} }

2
tests/disk_guided_shrink_postinstall.pm
View File

@ -5,7 +5,7 @@ use testapi;
sub run { sub run {
assert_screen "root_console"; assert_screen "root_console";
# mount first partition and check that it's intact # mount first partition and check that it's intact
validate_script_output 'mount /dev/vda1 /mnt; echo $?', sub { $_ =~ m/0/ }; assert_script_run 'mount /dev/vda1 /mnt';
validate_script_output 'cat /mnt/testfile', sub { $_ =~ m/Hello, world!/ }; validate_script_output 'cat /mnt/testfile', sub { $_ =~ m/Hello, world!/ };
} }

2
tests/uefi_postinstall.pm
View File

@ -9,7 +9,7 @@ sub run {
} }
assert_screen "root_console"; assert_screen "root_console";
# this test shows if the system is booted with efi # this test shows if the system is booted with efi
validate_script_output '[ -d /sys/firmware/efi/ ]; echo $?', sub { $_ =~ m/0/ }; assert_script_run '[ -d /sys/firmware/efi/ ]';
} }
sub test_flags { sub test_flags {

6
tests/upgrade_preinstall.pm
View File

@ -18,7 +18,7 @@ sub run {
# upgrader should be installed on up-to-date system # upgrader should be installed on up-to-date system
validate_script_output 'dnf -y update; echo $?', sub { $_ =~ m/0/ }, 1800; assert_script_run 'dnf -y update', 1800;
script_run "reboot"; script_run "reboot";
@ -29,8 +29,8 @@ sub run {
} }
$self->root_console(tty=>3); $self->root_console(tty=>3);
my $update_command = 'dnf -y --enablerepo=updates-testing install dnf-plugin-system-upgrade; echo $?'; my $update_command = 'dnf -y --enablerepo=updates-testing install dnf-plugin-system-upgrade';
validate_script_output $update_command, sub { $_ =~ m/0/ }, 1800; assert_script_run $update_command, 1800;
} }