From e1e89017ca4b5135a8a3d8b4a21dc837028fdfda Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Fri, 11 Sep 2026 15:36:25 -0400 Subject: [PATCH] pkg/machine/e2e: simplify runWslCommand runWslCommand never returns err != nil because if there's an error, it calls Fail (which panics, so the code after it is unreachable). Remove error returning and checking. Inspired by the following linter warning: > pkg/machine/e2e/config_windows_test.go:59:56: runWslCommand - result 1 (error) is always nil (unparam) > func runWslCommand(cmdArgs []string) (*machineSession, error) { > ^ Signed-off-by: Kir Kolyshkin (cherry picked from commit 94442ae44e3feda96623a479e7d1ab58ccfa3063) Signed-off-by: Lokesh Mandvekar --- pkg/machine/e2e/config_windows_test.go | 5 ++--- pkg/machine/e2e/init_windows_test.go | 22 +++++----------------- 2 files changed, 7 insertions(+), 20 deletions(-) diff --git a/pkg/machine/e2e/config_windows_test.go b/pkg/machine/e2e/config_windows_test.go index 0e80883a70..ec1a7e45ad 100644 --- a/pkg/machine/e2e/config_windows_test.go +++ b/pkg/machine/e2e/config_windows_test.go @@ -38,16 +38,15 @@ func getOtherProvider() string { return "" } -func runWslCommand(cmdArgs []string) (*machineSession, error) { +func runWslCommand(cmdArgs []string) *machineSession { binary := "wsl" GinkgoWriter.Println(binary + " " + strings.Join(cmdArgs, " ")) c := exec.Command(binary, cmdArgs...) session, err := Start(c, GinkgoWriter, GinkgoWriter) if err != nil { Fail(fmt.Sprintf("Unable to start session: %q", err)) - return nil, err } ms := machineSession{session} ms.waitWithTimeout(defaultTimeout) - return &ms, nil + return &ms } diff --git a/pkg/machine/e2e/init_windows_test.go b/pkg/machine/e2e/init_windows_test.go index 67c3a82898..c7d77dc5f2 100644 --- a/pkg/machine/e2e/init_windows_test.go +++ b/pkg/machine/e2e/init_windows_test.go @@ -27,15 +27,8 @@ var _ = Describe("podman machine init - windows only", func() { Expect(session).To(Exit(0)) defer func() { - _, err := runWslCommand([]string{"--terminate", "podman-net-usermode"}) - if err != nil { - fmt.Println("unable to terminate podman-net-usermode") - } - - _, err = runWslCommand([]string{"--unregister", "podman-net-usermode"}) - if err != nil { - fmt.Println("unable to unregister podman-net-usermode") - } + runWslCommand([]string{"--terminate", "podman-net-usermode"}) + runWslCommand([]string{"--unregister", "podman-net-usermode"}) }() inspect := new(inspectMachine) @@ -105,20 +98,15 @@ var _ = Describe("podman machine init - windows only", func() { // a vm outside the context of podman-machine and also // so we dont have to download a distribution from microsoft // servers - exportSession, err := runWslCommand([]string{"--export", "podman-foobarexport", exportedPath}) - Expect(err).ToNot(HaveOccurred()) + exportSession := runWslCommand([]string{"--export", "podman-foobarexport", exportedPath}) Expect(exportSession).To(Exit(0)) // importing the machine and creating a vm - importSession, err := runWslCommand([]string{"--import", distName, distrDir, exportedPath}) - Expect(err).ToNot(HaveOccurred()) + importSession := runWslCommand([]string{"--import", distName, distrDir, exportedPath}) Expect(importSession).To(Exit(0)) defer func() { - _, err := runWslCommand([]string{"--unregister", distName}) - if err != nil { - fmt.Println("unable to remove bogus wsl instance") - } + runWslCommand([]string{"--unregister", distName}) }() // Trying to make a vm with the same name as an existing name should result in a 125