From 6da1dbcdb9002acaec172c95ce9b0569e4f23b4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20R=C5=AF=C5=BEi=C4=8Dka?= Date: Wed, 28 Jul 2021 09:02:02 +0200 Subject: [PATCH] Small fixes. --- VARIABLES.md | 3 +-- main.pm | 56 +++++++++++++++++++++++----------------------------- 2 files changed, 26 insertions(+), 33 deletions(-) diff --git a/VARIABLES.md b/VARIABLES.md index f3ae3e32..7fd2fbe7 100644 --- a/VARIABLES.md +++ b/VARIABLES.md @@ -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 ------------- diff --git a/main.pm b/main.pm index 7494b58e..95009134 100644 --- a/main.pm +++ b/main.pm @@ -314,7 +314,7 @@ sub load_postinstall_tests() { # console avc / crash check # it makes no sense to run this after logging in on most post- # install tests (hence ! BOOTFROM) and we do not want it - # on crashed installations (hence ! CRASH_REPORT) but we *do* want + # on crashed installations (hence ! CRASH_REPORT) but we *do* want # to run it on upgrade tests after upgrading (hence UPGRADE) # desktops have specific tests for this (hence !DESKTOP). For # desktop upgrades we should really upload a disk image at the end @@ -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 @@ -368,7 +362,7 @@ sub load_postinstall_tests() { if (get_var("STORE_HDD_1") || get_var("STORE_HDD_2") || get_var("PUBLISH_HDD_1")) { autotest::loadtest "tests/_console_shutdown.pm"; } - + } @@ -410,7 +404,7 @@ if (!get_var("ENTRYPOINT")) { load_postinstall_tests; } -# load application start-stop tests +# load application start-stop tests if (get_var("STARTSTOP")) { my $desktop = get_var('DESKTOP'); my $casedir = get_var('CASEDIR'); @@ -418,7 +412,7 @@ if (get_var("STARTSTOP")) { if ($desktop eq 'gnome') { # Run this test to preset the environment autotest::loadtest "tests/apps_gnome_preset.pm"; - } + } # Find all tests from a directory defined by the DESKTOP variable my @apptests = glob "${casedir}/tests/apps_startstop/${desktop}/*.pm";