containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix WSL machine test regressions 

WSL is unable to set or change CPU/memory settings.  We should not test
for them.

Skip one test and filed issue #20978

Signed-off-by: Brent Baude <bbaude@redhat.com>
This commit is contained in:
Brent Baude 2023-12-08 14:41:39 -06:00
parent d513749085
commit 36e29a8432
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cirrus.yml
View File

@ -33,7 +33,7 @@ env:
DEBIAN_NAME: "debian-13" DEBIAN_NAME: "debian-13"
# Image identifiers # Image identifiers
IMAGE_SUFFIX: "c20231206t225809z-f39f38d13" IMAGE_SUFFIX: "c20231208t193858z-f39f38d13"
# EC2 images # EC2 images

2
pkg/machine/e2e/init_test.go
View File

@ -79,7 +79,7 @@ var _ = Describe("podman machine init", func() {
testMachine := inspectBefore[0] testMachine := inspectBefore[0]
Expect(testMachine.Name).To(Equal(mb.names[0])) Expect(testMachine.Name).To(Equal(mb.names[0]))
if testProvider.VMType() == machine.WSLVirt { // WSL hardware specs are hardcoded if testProvider.VMType() != machine.WSLVirt { // WSL hardware specs are hardcoded
Expect(testMachine.Resources.CPUs).To(Equal(uint64(cpus))) Expect(testMachine.Resources.CPUs).To(Equal(uint64(cpus)))
Expect(testMachine.Resources.Memory).To(Equal(uint64(2048))) Expect(testMachine.Resources.Memory).To(Equal(uint64(2048)))
} }

3
pkg/machine/e2e/list_test.go
View File

@ -80,6 +80,7 @@ var _ = Describe("podman machine list", func() {
}) })
It("list machine: check if running while starting", func() { It("list machine: check if running while starting", func() {
skipIfWSL("the below logic does not work on WSL. #20978")
i := new(initMachine) i := new(initMachine)
session, err := mb.setCmd(i.withImagePath(mb.imagePath)).run() session, err := mb.setCmd(i.withImagePath(mb.imagePath)).run()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
@ -91,6 +92,8 @@ var _ = Describe("podman machine list", func() {
Expect(listSession).To(Exit(0)) Expect(listSession).To(Exit(0))
Expect(listSession.outputToString()).To(Equal("Never")) Expect(listSession.outputToString()).To(Equal("Never"))
// The logic in this test stanza is seemingly invalid on WSL.
// issue #20978 reflects this change
s := new(startMachine) s := new(startMachine)
startSession, err := mb.setCmd(s).runWithoutWait() startSession, err := mb.setCmd(s).runWithoutWait()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())