From b8c58428b0990a26b234e0f52659b5ba7b8ffd10 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Thu, 29 Jul 2021 11:19:09 -0700 Subject: [PATCH] Don't check for git on CANNED `rpm` doesn't work. I dunno off-hand how you'd install git on ostree if it wasn't there, so let's just assume it will be. Signed-off-by: Adam Williamson --- tests/applications/evince/aaa_setup.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/applications/evince/aaa_setup.pm b/tests/applications/evince/aaa_setup.pm index 9202d09a..14642d4f 100644 --- a/tests/applications/evince/aaa_setup.pm +++ b/tests/applications/evince/aaa_setup.pm @@ -9,8 +9,10 @@ use utils; sub check_and_install_git { # Let's see if Git is installed and install it, if it isn't. - if (script_run("rpm -q git")) { - assert_script_run("dnf install -y git"); + unless (get_var("CANNED")) { + if (script_run("rpm -q git")) { + assert_script_run("dnf -y install git", 180); + } } }