From 675182c2e94b981f4528575875c7ea3b350683e7 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Wed, 12 Nov 2025 15:44:26 +0100 Subject: [PATCH] fix gofumpt issues on main Two PRs[1,2] were merged without rebasing resulting in a conflict since the one enabled gofumpt while the other PR contained formatting not according to that so now the lint fails. [1] https://github.com/containers/podman/pull/27498 [2] https://github.com/containers/podman/pull/27493 Signed-off-by: Paul Holzinger --- pkg/machine/e2e/config_darwin_test.go | 4 +--- pkg/machine/e2e/config_freebsd_test.go | 4 +--- pkg/machine/e2e/config_linux_test.go | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/pkg/machine/e2e/config_darwin_test.go b/pkg/machine/e2e/config_darwin_test.go index fabd83d735..0703203883 100644 --- a/pkg/machine/e2e/config_darwin_test.go +++ b/pkg/machine/e2e/config_darwin_test.go @@ -4,9 +4,7 @@ import "os" const podmanBinary = "../../../bin/darwin/podman" -var ( - fakeImagePath string = os.DevNull -) +var fakeImagePath string = os.DevNull func (i *initMachine) withFakeImage(_ *machineTestBuilder) *initMachine { i.image = fakeImagePath diff --git a/pkg/machine/e2e/config_freebsd_test.go b/pkg/machine/e2e/config_freebsd_test.go index c03275e5d3..bf58059e51 100644 --- a/pkg/machine/e2e/config_freebsd_test.go +++ b/pkg/machine/e2e/config_freebsd_test.go @@ -4,9 +4,7 @@ import "os" const podmanBinary = "../../../bin/podman-remote" -var ( - fakeImagePath string = os.DevNull -) +var fakeImagePath string = os.DevNull func (i *initMachine) withFakeImage(_ *machineTestBuilder) *initMachine { i.image = fakeImagePath diff --git a/pkg/machine/e2e/config_linux_test.go b/pkg/machine/e2e/config_linux_test.go index c03275e5d3..bf58059e51 100644 --- a/pkg/machine/e2e/config_linux_test.go +++ b/pkg/machine/e2e/config_linux_test.go @@ -4,9 +4,7 @@ import "os" const podmanBinary = "../../../bin/podman-remote" -var ( - fakeImagePath string = os.DevNull -) +var fakeImagePath string = os.DevNull func (i *initMachine) withFakeImage(_ *machineTestBuilder) *initMachine { i.image = fakeImagePath