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

Merge pull request #20158 from baude/wslenableinit

Browse Source 
wsl: enable machine init tests
This commit is contained in:
OpenShift Merge Robot
2023-09-27 21:04:01 -04:00
committed by GitHub
parent 94139ece9e 0d4526e61c
commit 71b3d77031
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,9 +52,10 @@ 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
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)))
}
}) })
It("simple init with start", func() { It("simple init with start", func() {
@ -97,13 +98,16 @@ var _ = Describe("podman machine init", func() {
Expect(inspectBefore).ToNot(BeEmpty()) Expect(inspectBefore).ToNot(BeEmpty())
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 { // memory and cpus something we cannot set with WSL
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)))
Expect(testMachine.SSHConfig.RemoteUsername).To((Equal(remoteUsername))) }
Expect(testMachine.SSHConfig.RemoteUsername).To(Equal(remoteUsername))
}) })
It("machine init with cpus, disk size, memory, timezone", func() { It("machine init with cpus, disk size, memory, timezone", func() {
skipIfWSL("setting hardware resource numbers and timezone are not supported on WSL")
name := randomString() name := randomString()
i := new(initMachine) i := new(initMachine)
session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath).withCPUs(2).withDiskSize(102).withMemory(4096).withTimezone("Pacific/Honolulu")).run() session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath).withCPUs(2).withDiskSize(102).withMemory(4096).withTimezone("Pacific/Honolulu")).run()
@ -147,6 +151,7 @@ var _ = Describe("podman machine init", func() {
if testProvider.VMType() == machine.HyperVVirt { if testProvider.VMType() == machine.HyperVVirt {
Skip("volumes are not supported on hyperv yet") Skip("volumes are not supported on hyperv yet")
} }
skipIfWSL("WSL volumes are much different. This test will not pass as is")
tmpDir, err := os.MkdirTemp("", "") tmpDir, err := os.MkdirTemp("", "")
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
@ -157,20 +162,15 @@ var _ = Describe("podman machine init", func() {
name := randomString() name := randomString()
i := new(initMachine) i := new(initMachine)
session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath).withVolume(mount)).run() session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath).withVolume(mount).withNow()).run()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(session).To(Exit(0)) Expect(session).To(Exit(0))
s := new(startMachine) ssh := sshMachine{}
startSession, err := mb.setCmd(s).run() sshSession, err := mb.setName(name).setCmd(ssh.withSSHCommand([]string{"ls /testmountdir"})).run()
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
Expect(startSession).To(Exit(0)) Expect(sshSession).To(Exit(0))
Expect(sshSession.outputToString()).To(ContainSubstring("example"))
ssh2 := sshMachine{}
sshSession2, err := mb.setName(name).setCmd(ssh2.withSSHCommand([]string{"ls /testmountdir"})).run()
Expect(err).ToNot(HaveOccurred())
Expect(sshSession2).To(Exit(0))
Expect(sshSession2.outputToString()).To(ContainSubstring("example"))
}) })
It("machine init rootless docker.sock check", func() { It("machine init rootless docker.sock check", func() {