diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-09-13 16:36:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-13 16:36:21 +0200 |
| commit | 5c09c4d2947a759724f9d5aef6bac04317e03f7e (patch) | |
| tree | 288f53308185f1d423bcfd41a53859d67f5e4844 /test/system | |
| parent | b095d8a794edaab3b2d622b6882bfd57fad8375e (diff) | |
| parent | a6836eae5280dafc9ce3703bd3bad5d6720ff32e (diff) | |
| download | podman-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/system')
| -rw-r--r-- | test/system/065-cp.bats | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/test/system/065-cp.bats b/test/system/065-cp.bats index 204065bdb..0ca730a50 100644 --- a/test/system/065-cp.bats +++ b/test/system/065-cp.bats @@ -27,13 +27,8 @@ load helpers "echo $rand_content1 >/tmp/$rand_filename1; echo $rand_content2 >/tmp/$rand_filename2" - run_podman cp 'cpcontainer:/tmp/*' $dstdir - - test -e $dstdir/$rand_filename1 || die "file 1 not copied from container" - test -e $dstdir/$rand_filename2 || die "file 2 not copied from container" - - is "$(<$dstdir/$rand_filename1)" "$rand_content1" "content of file 1" - is "$(<$dstdir/$rand_filename2)" "$rand_content2" "content of file 2" + # cp no longer supports wildcarding + run_podman 125 cp 'cpcontainer:/tmp/*' $dstdir run_podman rm cpcontainer } @@ -150,13 +145,13 @@ load helpers # Copy file from host into container, into a file named 'x' # Note that the second has a trailing slash; this will trigger mkdir - run_podman cp $srcdir/$rand_filename1 cpcontainer:/tmp/d1/x + run_podman cp --pause=false $srcdir/$rand_filename1 cpcontainer:/tmp/d1/x is "$output" "" "output from podman cp 1" - run_podman cp $srcdir/$rand_filename2 cpcontainer:/tmp/d2/x/ + run_podman cp --pause=false $srcdir/$rand_filename2 cpcontainer:/tmp/d2/x/ is "$output" "" "output from podman cp 3" - run_podman cp $srcdir/$rand_filename3 cpcontainer:/tmp/d3/x + run_podman cp --pause=false $srcdir/$rand_filename3 cpcontainer:/tmp/d3/x is "$output" "" "output from podman cp 3" # Read back. @@ -205,7 +200,7 @@ load helpers "mkdir -p $graphroot; trap 'exit 0' 15;while :;do sleep 0.5;done" # Copy from host into container. - run_podman cp $srcdir/$rand_filename cpcontainer:$graphroot/$rand_filename + run_podman cp --pause=false $srcdir/$rand_filename cpcontainer:$graphroot/$rand_filename # ls, and confirm it's there. run_podman exec cpcontainer ls -l $graphroot/$rand_filename |