diff --git a/test/e2e/exec_test.go b/test/e2e/exec_test.go index 2b5b411d5b..3c5876b65f 100644 --- a/test/e2e/exec_test.go +++ b/test/e2e/exec_test.go @@ -457,7 +457,9 @@ var _ = Describe("Podman exec", func() { files := []*os.File{ devNull, } - session := podmanTest.PodmanExtraFiles([]string{"exec", "--preserve-fds", "1", "test1", "ls"}, files) + session := podmanTest.PodmanWithOptions(PodmanExecOptions{ + ExtraFiles: files, + }, "exec", "--preserve-fds", "1", "test1", "ls") session.WaitWithDefaultTimeout() Expect(session).Should(ExitCleanly()) }) diff --git a/test/e2e/libpod_suite_remote_test.go b/test/e2e/libpod_suite_remote_test.go index 4172976634..19bc14f0b0 100644 --- a/test/e2e/libpod_suite_remote_test.go +++ b/test/e2e/libpod_suite_remote_test.go @@ -45,13 +45,6 @@ func (p *PodmanTestIntegration) PodmanSystemdScope(args []string) *PodmanSession }, args...) } -// PodmanExtraFiles is the exec call to podman on the filesystem and passes down extra files -func (p *PodmanTestIntegration) PodmanExtraFiles(args []string, extraFiles []*os.File) *PodmanSessionIntegration { - return p.PodmanWithOptions(PodmanExecOptions{ - ExtraFiles: extraFiles, - }, args...) -} - func (p *PodmanTestIntegration) setDefaultRegistriesConfigEnv() { defaultFile := "registries.conf" if UsingCacheRegistry() { diff --git a/test/e2e/libpod_suite_test.go b/test/e2e/libpod_suite_test.go index 65696b0786..0ebd27b2a6 100644 --- a/test/e2e/libpod_suite_test.go +++ b/test/e2e/libpod_suite_test.go @@ -37,13 +37,6 @@ func (p *PodmanTestIntegration) PodmanSystemdScope(args []string) *PodmanSession }, args...) } -// PodmanExtraFiles is the exec call to podman on the filesystem and passes down extra files -func (p *PodmanTestIntegration) PodmanExtraFiles(args []string, extraFiles []*os.File) *PodmanSessionIntegration { - return p.PodmanWithOptions(PodmanExecOptions{ - ExtraFiles: extraFiles, - }, args...) -} - func (p *PodmanTestIntegration) setDefaultRegistriesConfigEnv() { defaultFile := "registries.conf" if UsingCacheRegistry() { diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go index 80c80f699c..e9e54e21d7 100644 --- a/test/e2e/run_test.go +++ b/test/e2e/run_test.go @@ -1849,7 +1849,9 @@ VOLUME %s`, ALPINE, volPath, volPath) files := []*os.File{ devNull, } - session := podmanTest.PodmanExtraFiles([]string{"run", "--preserve-fds", "1", ALPINE, "ls"}, files) + session := podmanTest.PodmanWithOptions(PodmanExecOptions{ + ExtraFiles: files, + }, "run", "--preserve-fds", "1", ALPINE, "ls") session.WaitWithDefaultTimeout() Expect(session).Should(ExitCleanly()) })