From fd639049544c09f64e11775c9d157fb467692eb3 Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Wed, 14 Feb 2024 11:59:33 +0100 Subject: [PATCH] preflight: Fix tests with go 1.21 --- pkg/crc/preflight/preflight_linux_test.go | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/crc/preflight/preflight_linux_test.go b/pkg/crc/preflight/preflight_linux_test.go index 5f466361e3..21de2ccfc8 100644 --- a/pkg/crc/preflight/preflight_linux_test.go +++ b/pkg/crc/preflight/preflight_linux_test.go @@ -95,7 +95,7 @@ var checkListForDistros = []checkListForDistro{ {check: checkCrcNetworkManagerDispatcherFile}, {check: checkLibvirtCrcNetworkAvailable}, {check: checkLibvirtCrcNetworkActive}, - {check: checkBundleExtracted(constants.GetDefaultBundlePath(preset.OpenShift))}, + {configKeySuffix: "check-bundle-extracted"}, }, }, { @@ -133,7 +133,7 @@ var checkListForDistros = []checkListForDistro{ {check: checkCrcDnsmasqConfigFile}, {check: checkLibvirtCrcNetworkAvailable}, {check: checkLibvirtCrcNetworkActive}, - {check: checkBundleExtracted(constants.GetDefaultBundlePath(preset.OpenShift))}, + {configKeySuffix: "check-bundle-extracted"}, }, }, { @@ -165,7 +165,7 @@ var checkListForDistros = []checkListForDistro{ {check: checkDaemonSystemdService}, {check: checkDaemonSystemdSockets}, {check: checkVsock}, - {check: checkBundleExtracted(constants.GetDefaultBundlePath(preset.OpenShift))}, + {configKeySuffix: "check-bundle-extracted"}, }, }, { @@ -204,7 +204,7 @@ var checkListForDistros = []checkListForDistro{ {check: checkCrcNetworkManagerDispatcherFile}, {check: checkLibvirtCrcNetworkAvailable}, {check: checkLibvirtCrcNetworkActive}, - {check: checkBundleExtracted(constants.GetDefaultBundlePath(preset.OpenShift))}, + {configKeySuffix: "check-bundle-extracted"}, }, }, { @@ -242,7 +242,7 @@ var checkListForDistros = []checkListForDistro{ {check: checkCrcDnsmasqConfigFile}, {check: checkLibvirtCrcNetworkAvailable}, {check: checkLibvirtCrcNetworkActive}, - {check: checkBundleExtracted(constants.GetDefaultBundlePath(preset.OpenShift))}, + {configKeySuffix: "check-bundle-extracted"}, }, }, { @@ -274,7 +274,7 @@ var checkListForDistros = []checkListForDistro{ {check: checkDaemonSystemdService}, {check: checkDaemonSystemdSockets}, {check: checkVsock}, - {check: checkBundleExtracted(constants.GetDefaultBundlePath(preset.OpenShift))}, + {configKeySuffix: "check-bundle-extracted"}, }, }, { @@ -313,7 +313,7 @@ var checkListForDistros = []checkListForDistro{ {check: checkCrcNetworkManagerDispatcherFile}, {check: checkLibvirtCrcNetworkAvailable}, {check: checkLibvirtCrcNetworkActive}, - {check: checkBundleExtracted(constants.GetDefaultBundlePath(preset.OpenShift))}, + {configKeySuffix: "check-bundle-extracted"}, }, }, { @@ -351,7 +351,7 @@ var checkListForDistros = []checkListForDistro{ {check: checkCrcDnsmasqConfigFile}, {check: checkLibvirtCrcNetworkAvailable}, {check: checkLibvirtCrcNetworkActive}, - {check: checkBundleExtracted(constants.GetDefaultBundlePath(preset.OpenShift))}, + {configKeySuffix: "check-bundle-extracted"}, }, }, { @@ -383,7 +383,7 @@ var checkListForDistros = []checkListForDistro{ {check: checkDaemonSystemdService}, {check: checkDaemonSystemdSockets}, {check: checkVsock}, - {check: checkBundleExtracted(constants.GetDefaultBundlePath(preset.OpenShift))}, + {configKeySuffix: "check-bundle-extracted"}, }, }, { @@ -423,7 +423,7 @@ var checkListForDistros = []checkListForDistro{ {check: checkCrcNetworkManagerDispatcherFile}, {check: checkLibvirtCrcNetworkAvailable}, {check: checkLibvirtCrcNetworkActive}, - {check: checkBundleExtracted(constants.GetDefaultBundlePath(preset.OpenShift))}, + {configKeySuffix: "check-bundle-extracted"}, }, }, { @@ -462,7 +462,7 @@ var checkListForDistros = []checkListForDistro{ {check: checkCrcDnsmasqConfigFile}, {check: checkLibvirtCrcNetworkAvailable}, {check: checkLibvirtCrcNetworkActive}, - {check: checkBundleExtracted(constants.GetDefaultBundlePath(preset.OpenShift))}, + {configKeySuffix: "check-bundle-extracted"}, }, }, { @@ -495,7 +495,7 @@ var checkListForDistros = []checkListForDistro{ {check: checkDaemonSystemdSockets}, {configKeySuffix: "check-apparmor-profile-setup"}, {check: checkVsock}, - {check: checkBundleExtracted(constants.GetDefaultBundlePath(preset.OpenShift))}, + {configKeySuffix: "check-bundle-extracted"}, }, }, }