summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2019-09-13 16:36:21 +0200
committerGitHub <noreply@github.com>2019-09-13 16:36:21 +0200
commit5c09c4d2947a759724f9d5aef6bac04317e03f7e (patch)
tree288f53308185f1d423bcfd41a53859d67f5e4844 /test/e2e
parentb095d8a794edaab3b2d622b6882bfd57fad8375e (diff)
parenta6836eae5280dafc9ce3703bd3bad5d6720ff32e (diff)
downloadpodman-5c09c4d2947a759724f9d5aef6bac04317e03f7e.tar.gz
podman-5c09c4d2947a759724f9d5aef6bac04317e03f7e.tar.bz2
podman-5c09c4d2947a759724f9d5aef6bac04317e03f7e.zip
Merge pull request #3942 from jwhonce/issue/3829
Stop glob'ing on podman cp
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/cp_test.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/e2e/cp_test.go b/test/e2e/cp_test.go
index edd9c70c6..9b0cb757d 100644
--- a/test/e2e/cp_test.go
+++ b/test/e2e/cp_test.go
@@ -223,7 +223,7 @@ var _ = Describe("Podman cp", func() {
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- session = podmanTest.Podman([]string{"cp", "testctr:testfile", "testfile1"})
+ session = podmanTest.Podman([]string{"cp", "--pause=false", "testctr:testfile", "testfile1"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
@@ -233,7 +233,7 @@ var _ = Describe("Podman cp", func() {
Expect(err).To(BeNil())
Expect(strings.Contains(string(cmdRet), "testuser")).To(BeFalse())
- session = podmanTest.Podman([]string{"cp", "testfile1", "testctr:testfile2"})
+ session = podmanTest.Podman([]string{"cp", "--pause=false", "testfile1", "testctr:testfile2"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))