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

Remove log-level from runSystemCommand since wsl does not support it

Browse Source 
Signed-off-by: Jason T. Greene <jason.greene@redhat.com>
This commit is contained in:
Jason T. Greene
2024-02-14 15:25:32 -06:00
parent 144e420bb9
commit d221e0b00a
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/machine/e2e/config_test.go
View File

@ -236,10 +236,8 @@ func isWSL() bool {
return isVmtype(define.WSLVirt) return isVmtype(define.WSLVirt)
} }
//nolint:unused
func runSystemCommand(binary string, cmdArgs []string, timeout time.Duration, wait bool) (*machineSession, error) { func runSystemCommand(binary string, cmdArgs []string, timeout time.Duration, wait bool) (*machineSession, error) {
if len(os.Getenv("DEBUG")) > 0 {
cmdArgs = append([]string{"--log-level=debug"}, cmdArgs...)
}
GinkgoWriter.Println(binary + " " + strings.Join(cmdArgs, " ")) GinkgoWriter.Println(binary + " " + strings.Join(cmdArgs, " "))
c := exec.Command(binary, cmdArgs...) c := exec.Command(binary, cmdArgs...)
session, err := Start(c, GinkgoWriter, GinkgoWriter) session, err := Start(c, GinkgoWriter, GinkgoWriter)

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

@ -78,7 +78,7 @@ var _ = Describe("podman machine init - windows only", func() {
Expect(session.errorToString()).To(ContainSubstring("already exists on hypervisor")) Expect(session.errorToString()).To(ContainSubstring("already exists on hypervisor"))
}) })
It("init should not should not overwrite existing HyperV vms", func() { It("init should not overwrite existing WSL vms", func() {
skipIfNotVmtype(define.WSLVirt, "WSL test only") skipIfNotVmtype(define.WSLVirt, "WSL test only")
var ( var (