opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 10:38:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2974 from edsantiago/bats

Browse Source 
bats - various small updates
This commit is contained in:
OpenShift Merge Robot
2019-04-25 06:28:40 -07:00
committed by GitHub
parent bc98f1c736 78bd2eac06
commit ee8488555b
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/system/005-info.bats
View File

@ -3,7 +3,7 @@
load helpers load helpers
@test "podman info - basic test" { @test "podman info - basic test" {
skip_if_remote skip_if_remote "capitalization inconsistencies"
run_podman info run_podman info
@ -28,7 +28,7 @@ RunRoot:
} }
@test "podman info - json" { @test "podman info - json" {
skip_if_remote skip_if_remote "capitalization inconsistencies"
run_podman info --format=json run_podman info --format=json

2
test/system/030-run.bats
View File

@ -3,8 +3,6 @@
load helpers load helpers
@test "podman run - basic tests" { @test "podman run - basic tests" {
skip_if_remote
rand=$(random_string 30) rand=$(random_string 30)
tests=" tests="
true | 0 | true | 0 |

2
test/system/035-logs.bats
View File

@ -6,8 +6,6 @@
load helpers load helpers
@test "podman logs - basic test" { @test "podman logs - basic test" {
skip_if_remote
rand_string=$(random_string 40) rand_string=$(random_string 40)
run_podman create $IMAGE echo $rand_string run_podman create $IMAGE echo $rand_string

6
test/system/070-build.bats
View File

@ -6,7 +6,11 @@
load helpers load helpers
@test "podman build - basic test" { @test "podman build - basic test" {
skip_if_remote if [[ "$PODMAN" =~ -remote ]]; then
if [ "$(id -u)" -ne 0 ]; then
skip "unreliable with podman-remote and rootless; #2972"
fi
fi
rand_filename=$(random_string 20) rand_filename=$(random_string 20)
rand_content=$(random_string 50) rand_content=$(random_string 50)

8
test/system/400-unprivileged-access.bats
View File

@ -31,6 +31,12 @@ die() {
echo "#| FAIL: $*" >&2 echo "#| FAIL: $*" >&2
echo "#\\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" >&2 echo "#\\^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^" >&2
# Show permissions of directories from here on up
while expr "$path" : "/var/lib/containers" >/dev/null; do
echo "#| $(ls -ld $path)"
path=$(dirname $path)
done
exit 1 exit 1
} }
@ -65,8 +71,10 @@ EOF
# get podman image and container storage directories # get podman image and container storage directories
run_podman info --format '{{.store.GraphRoot}}' run_podman info --format '{{.store.GraphRoot}}'
is "$output" "/var/lib/containers/storage" "GraphRoot in expected place"
GRAPH_ROOT="$output" GRAPH_ROOT="$output"
run_podman info --format '{{.store.RunRoot}}' run_podman info --format '{{.store.RunRoot}}'
is "$output" "/var/run/containers/storage" "RunRoot in expected place"
RUN_ROOT="$output" RUN_ROOT="$output"
# The main test: find all world-writable files or directories underneath # The main test: find all world-writable files or directories underneath