diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-16 11:25:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-16 11:25:33 +0100 |
| commit | 72ddf2fb96332ea70cb7fa126410ab6b6ed44941 (patch) | |
| tree | 6d0327afcb7e00979af56c798e87d80c15a0c334 /test/apiv2 | |
| parent | e7dc59252bd722377938ac3e6b4fd7e077f05293 (diff) | |
| parent | 963d19c759c843a2cdb853a508dbe6a4db8c87cf (diff) | |
| download | podman-72ddf2fb96332ea70cb7fa126410ab6b6ed44941.tar.gz podman-72ddf2fb96332ea70cb7fa126410ab6b6ed44941.tar.bz2 podman-72ddf2fb96332ea70cb7fa126410ab6b6ed44941.zip | |
Merge pull request #9719 from edsantiago/bats
System test cleanup
Diffstat (limited to 'test/apiv2')
| -rw-r--r-- | test/apiv2/44-mounts.at | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/test/apiv2/44-mounts.at b/test/apiv2/44-mounts.at index 901245da6..d54669e7d 100644 --- a/test/apiv2/44-mounts.at +++ b/test/apiv2/44-mounts.at @@ -6,7 +6,7 @@ podman pull $IMAGE &>/dev/null tmpfs_name="/mytmpfs" t POST containers/create?name=hostconfig_test \ Image=$IMAGE \ - Cmd='["df"]' \ + Cmd='["df","-P","'$tmpfs_name'"]' \ HostConfig='{"Binds":["/tmp/doesnotexist:/test1"]' \ TmpFs="{\"$tmpfs_name\":\"rw\"}}" \ 201 \ @@ -22,5 +22,10 @@ t POST containers/${cid}/start 204 t POST containers/${cid}/wait 200 t GET containers/${cid}/logs?stdout=true 200 -like "$(<$WORKDIR/curl.result.out)" ".* ${tmpfs_name}" \ +# /logs returns application/octet-stream, which our test helper saves in +# an outfile rather than returning in $output. That's why we can't test +# this directly in the /logs test above; instead, we rely on knowing the +# path to the stored results. The 'tr' is needed because there may be +# null bytes in the outfile. +like "$(tr -d \\0 <$WORKDIR/curl.result.out)" ".* ${tmpfs_name}" \ "'df' output includes tmpfs name" |