opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2026-03-13 08:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

pkg/machine/e2e: simplify runWslCommand

Browse Source 
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 <kolyshkin@gmail.com>
This commit is contained in:
Kir Kolyshkin
2026-02-09 13:46:08 -08:00
parent f9002cfd31
commit 94442ae44e
2 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/machine/e2e/config_windows_test.go
View File

@@ -56,18 +56,17 @@ func pgrep(n string) (string, error) {
return strOut, nil
}
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
}
// withFakeImage should be used in tests where the machine is

22
pkg/machine/e2e/init_windows_test.go
View File

@@ -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