From ec79aa0bc48e52a18ca0971f7460a2ab1426af95 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Feb 10 2025 22:05:06 +0000
Subject: podman: twiddle flow a bit, give dnf command a little longer


We don't really need two separate CANNED conditionals and two
dnf commands, let's flip it around like this, and give the
remaining command 300 seconds not 240.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/tests/podman.pm b/tests/podman.pm
index 92ae42a..311279d 100644
--- a/tests/podman.pm
+++ b/tests/podman.pm
@@ -9,13 +9,18 @@ use utils;
 sub run {
     my $self = shift;
     $self->root_console(tty => 3);
-    # on non-canned flavors, we need to install podman
-    assert_script_run "dnf -y install podman", 240 unless (get_var("CANNED"));
+    # on non-canned flavors, we need to install podman, may as well
+    # also install the tests now
+
     # check podman is installed
-    assert_script_run "rpm -q podman";
+
     my $relnum = get_release_number;
-    unless (get_var("CANNED")) {
-        # run the upstream integration tests
+    if (get_var("CANNED")) {
+        # check podman is pre-installed
+        assert_script_run "rpm -q podman";
+    }
+    else {
+        # install podman and run the upstream integration tests
         assert_script_run "dnf -y install podman podman-tests bats", 300;
         # needed so we exit 1 when the bats command fails
         assert_script_run "set -o pipefail";