diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-01 20:37:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 20:37:15 -0400 |
| commit | 41c76d694fbaa8249ea21aab04968c38513d2a9e (patch) | |
| tree | d8a6f366b0564d2afc83aff990473d7a8084b178 | |
| parent | 1f3b13759fbfba118919c1809e0df0fc1646ab46 (diff) | |
| parent | b6167cedb2ba69a66646a94eb27c49bbbea88e15 (diff) | |
| download | podman-41c76d694fbaa8249ea21aab04968c38513d2a9e.tar.gz podman-41c76d694fbaa8249ea21aab04968c38513d2a9e.tar.bz2 podman-41c76d694fbaa8249ea21aab04968c38513d2a9e.zip | |
Merge pull request #10527 from edsantiago/bats
System tests: add :Z to volume mounts
| -rw-r--r-- | test/system/030-run.bats | 6 | ||||
| -rw-r--r-- | test/system/500-networking.bats | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 2ea981a85..32fc85c4e 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). @@ -702,6 +702,8 @@ EOF run_podman build -t nomtab $tmpdir run_podman run --rm nomtab stat -c %N /etc/mtab is "$output" "$expected" "/etc/mtab should be created" + + run_podman rmi nomtab } # vim: filetype=sh 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 |