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

Enhance _software_selection environment check for anaconda change

Browse Source 
anaconda changed how this log line looks (again); update the
check to handle old and new styles for now.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-05-06 09:00:28 -07:00
parent 055662fe36
commit 4691928c2f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/_software_selection.pm
View File

@ -21,7 +21,11 @@ sub run {
elsif (get_var('SUBVARIANT') eq 'Workstation') {
$env = 'workstation-product-environment';
}
assert_script_run "grep 'selected env' /tmp/anaconda.log /tmp/packaging.log | tail -1 | grep $env";
# pre-F35 line looks like:
# 07:51:39,382 INF modules.payloads.payload.dnf.utils: selected environment: custom-environment
# F35+ line looks like:
# 07:40:26,614 DBG ui.lib.software: Selecting the 'custom-environment' environment.
assert_script_run "egrep '(selected env|Selecting the.*environment)' /tmp/anaconda.log /tmp/packaging.log | tail -1 | grep $env";
send_key "ctrl-alt-f6";
assert_screen "anaconda_main_hub", 30;
return;