diff --git a/pkg/machine/e2e/ssh_test.go b/pkg/machine/e2e/ssh_test.go index ed753a7b27..5fedfea0f7 100644 --- a/pkg/machine/e2e/ssh_test.go +++ b/pkg/machine/e2e/ssh_test.go @@ -1,6 +1,7 @@ package e2e_test import ( + "github.com/containers/podman/v4/pkg/machine" . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" . "github.com/onsi/gomega/gexec" @@ -43,6 +44,7 @@ var _ = Describe("podman machine ssh", func() { }) It("ssh to running machine and check os-type", func() { + wsl := testProvider.VMType() == machine.WSLVirt name := randomString() i := new(initMachine) session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath).withNow()).run() @@ -53,13 +55,22 @@ var _ = Describe("podman machine ssh", func() { sshSession, err := mb.setName(name).setCmd(ssh.withSSHCommand([]string{"cat", "/etc/os-release"})).run() Expect(err).ToNot(HaveOccurred()) Expect(sshSession).To(Exit(0)) - Expect(sshSession.outputToString()).To(ContainSubstring("Fedora CoreOS")) + + if wsl { + Expect(sshSession.outputToString()).To(ContainSubstring("Fedora Linux")) + } else { + Expect(sshSession.outputToString()).To(ContainSubstring("Fedora CoreOS")) + } // keep exit code sshSession, err = mb.setName(name).setCmd(ssh.withSSHCommand([]string{"false"})).run() Expect(err).ToNot(HaveOccurred()) Expect(sshSession).To(Exit(1)) Expect(sshSession.outputToString()).To(Equal("")) - Expect(sshSession.errorToString()).To(Equal("")) + + // WSL will often emit an error message about the ssh key and keychains + if !wsl { + Expect(sshSession.errorToString()).To(Equal("")) + } }) })