Small fixes.
This commit is contained in:
parent
e0d9409c74
commit
6da1dbcdb9
@ -75,7 +75,7 @@ it also means that `B` conflicts `A` even if not shown in the table).
|
||||
| `TEST_UPDATES` | boolean | `false`/not set | set to indicate that this test checks updates.img loading, so we should check for the expected effect of the updates image used for this testing |
|
||||
| `PREINSTALL` | string | not set | nothing | If set, specified module will be loaded before reboot and install; module supposed to be starting as rescue mode |
|
||||
| `POSTINSTALL` | string | not set | `POSTINSTALL_PATH` | If set, `tests/(value)_postinstall.pm` will be loaded after install, boot, login, and other postinstall tests
|
||||
| `POSTINSTALL_PATH` | boolean | not set | `POSTINSTALL` | If set, `all tests on `TESTPATH` location will be loaded as postinstall tests after install, boot, login, and other postinstall tests |
|
||||
| `POSTINSTALL_PATH` | boolean | not set | `POSTINSTALL` | If set, `all tests on this location will be loaded as postinstall tests after install, boot, login, and other postinstall tests |
|
||||
| `UEFI` | boolean | `false`/not set | nothing | whether to use UEFI, this variable isn't usually set in test suites but in machine definition |
|
||||
| `ANACONDA_TEXT` | boolean | `false`/not set | all | when specified, anaconda will run in text mode |
|
||||
| `HELPCHECK` | boolean | `false`/not set | all | when specified, Anaconda Help will be called on each available pane. |
|
||||
@ -86,7 +86,6 @@ it also means that `B` conflicts `A` even if not shown in the table).
|
||||
| `BUGZILLA_LOGIN` | string | not set | used with `_SECRET_BUGZILLA_PASSWORD` | This is used to store a login string which does not get exposed in log files. |
|
||||
| `_SECRET_BUGZILLA_PASSWORD` | string | not set | used with `BUGZILLA_LOGIN` | This is used to store a password string which does not get exposed in log files. |
|
||||
| `_SECRET_BUGZILLA_APIKEY` | string | not set | used with other secrets | This is used to store an API key which does not get exposed in log files. |
|
||||
| `TESTPATH` | string | not set | can be used to set path for postinstall tests, if they are placed in subdirectories
|
||||
|
||||
Run variables
|
||||
-------------
|
||||
|
48
main.pm
48
main.pm
@ -323,33 +323,27 @@ sub load_postinstall_tests() {
|
||||
autotest::loadtest "tests/_console_avc_crash.pm";
|
||||
}
|
||||
|
||||
# generic post-install test will load if POSTINSTALL or POSTINSTALL_PATH
|
||||
# are set. If POSTINSTALL is set, then only tests provided in that list will
|
||||
# be run, with POSTINSTALL_PATH all tests on that path will be run without any
|
||||
# possibility to limit them.
|
||||
# These variables are mutually exclusive.
|
||||
# If POSTINSTALL is set, it means that we want to run selected tests,
|
||||
# specified in the POSTINSTALL variable.
|
||||
if (get_var("POSTINSTALL")) {
|
||||
my @pis = split(/ /, get_var("POSTINSTALL"));
|
||||
# For each test in POSTINSTALL, load the test
|
||||
foreach my $pi (@pis) {
|
||||
autotest::loadtest "tests/${pi}.pm";
|
||||
}
|
||||
}
|
||||
# If POSTINSTALL_PATH is set, we will load all available test files from that location
|
||||
# as postinstall tests.
|
||||
elsif (get_var("POSTINSTALL_PATH")) {
|
||||
my $casedir = get_var("CASEDIR");
|
||||
my $path = get_var("POSTINSTALL_PATH");
|
||||
# Read the list of files on that path,
|
||||
my @pis = glob "${casedir}/${path}/*.pm";
|
||||
# and load each of them.
|
||||
foreach my $pi (@pis) {
|
||||
$pi = basename($pi);
|
||||
autotest::loadtest "$path/$pi";
|
||||
}
|
||||
}
|
||||
# generic post-install test load
|
||||
if (get_var("POSTINSTALL")) {
|
||||
my @pis = split(/ /, get_var("POSTINSTALL"));
|
||||
# For each test in POSTINSTALL, load the test
|
||||
foreach my $pi (@pis) {
|
||||
autotest::loadtest "tests/${pi}.pm";
|
||||
}
|
||||
}
|
||||
# If POSTINSTALL_PATH is set, we will load all available test files from that location
|
||||
# as postinstall tests.
|
||||
elsif (get_var("POSTINSTALL_PATH")) {
|
||||
my $casedir = get_var("CASEDIR");
|
||||
my $path = get_var("POSTINSTALL_PATH");
|
||||
# Read the list of files on that path,
|
||||
my @pis = glob "${casedir}/${path}/*.pm";
|
||||
# and load each of them.
|
||||
foreach my $pi (@pis) {
|
||||
$pi = basename($pi);
|
||||
autotest::loadtest "$path/$pi";
|
||||
}
|
||||
}
|
||||
|
||||
# load the ADVISORY / KOJITASK post-install test - this records which
|
||||
# update or task packages were actually installed during the test. Don't
|
||||
|
Loading…
Reference in New Issue
Block a user