diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-02 10:29:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-02 10:29:59 -0400 |
| commit | 4b202ae29bbcbc00bcd0e9128b8e0a44080916c6 (patch) | |
| tree | 52cc51e8deeac278b7fe0c6719e05a14cbcc3125 | |
| parent | 96c0aa688b54552fa29cdf15923f095c8bd5c2c9 (diff) | |
| parent | dd83f5c0cd50e775023104a1827f55974f236a9f (diff) | |
| download | podman-4b202ae29bbcbc00bcd0e9128b8e0a44080916c6.tar.gz podman-4b202ae29bbcbc00bcd0e9128b8e0a44080916c6.tar.bz2 podman-4b202ae29bbcbc00bcd0e9128b8e0a44080916c6.zip | |
Merge pull request #10532 from edsantiago/mount_colon_z
[v3.2] System tests: add :Z to volume mounts
| -rw-r--r-- | test/system/030-run.bats | 4 | ||||
| -rw-r--r-- | test/system/500-networking.bats | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats index ccae703e5..55392ea47 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -600,12 +600,12 @@ json-file | f echo "$randomcontent" > $testdir/content # Workdir does not exist on the image but is volume mounted. - run_podman run --rm --workdir /IamNotOnTheImage -v $testdir:/IamNotOnTheImage $IMAGE cat content + run_podman run --rm --workdir /IamNotOnTheImage -v $testdir:/IamNotOnTheImage:Z $IMAGE cat content is "$output" "$randomcontent" "cat random content" # Workdir does not exist on the image but is created by the runtime as it's # a subdir of a volume. - run_podman run --rm --workdir /IamNotOntheImage -v $testdir/content:/IamNotOntheImage/foo $IMAGE cat foo + run_podman run --rm --workdir /IamNotOntheImage -v $testdir/content:/IamNotOntheImage/foo:Z $IMAGE cat foo is "$output" "$randomcontent" "cat random content" # Make sure that running on a read-only rootfs works (#9230). diff --git a/test/system/500-networking.bats b/test/system/500-networking.bats index 1cec50827..63b9a7c14 100644 --- a/test/system/500-networking.bats +++ b/test/system/500-networking.bats @@ -34,7 +34,7 @@ load helpers # Bind-mount this file with a different name to a container running httpd run_podman run -d --name myweb -p "$HOST_PORT:80" \ --restart always \ - -v $INDEX1:/var/www/index.txt \ + -v $INDEX1:/var/www/index.txt:Z \ -w /var/www \ $IMAGE /bin/busybox-extras httpd -f -p 80 cid=$output @@ -257,7 +257,7 @@ load helpers # Bind-mount this file with a different name to a container running httpd run_podman run -d --name myweb -p "$HOST_PORT:80" \ --network $netname \ - -v $INDEX1:/var/www/index.txt \ + -v $INDEX1:/var/www/index.txt:Z \ -w /var/www \ $IMAGE /bin/busybox-extras httpd -f -p 80 cid=$output |