From 4691928c2f3fa409001ae309f49570a10ad9d0b8 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 6 May 2021 09:00:28 -0700 Subject: [PATCH] Enhance _software_selection environment check for anaconda change anaconda changed how this log line looks (again); update the check to handle old and new styles for now. Signed-off-by: Adam Williamson --- tests/_software_selection.pm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/_software_selection.pm b/tests/_software_selection.pm index af298a51..f7f0f2e7 100644 --- a/tests/_software_selection.pm +++ b/tests/_software_selection.pm @@ -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;