diff options
author | Ed Santiago <santiago@redhat.com> | 2020-07-28 08:36:52 -0600 |
---|---|---|
committer | Ed Santiago <santiago@redhat.com> | 2020-08-03 09:36:36 -0600 |
commit | a4fcf09b7ab5daa30b37705702ba2c2e30e8f9c5 (patch) | |
tree | ae2f8fc696262c4a0c8dc3398c65c1d7b9f49be9 /test/system/140-diff.bats | |
parent | 2e3928ee1740c0eb2564ea6bb3004ad5b698ff8f (diff) | |
download | podman-a4fcf09b7ab5daa30b37705702ba2c2e30e8f9c5.tar.gz podman-a4fcf09b7ab5daa30b37705702ba2c2e30e8f9c5.tar.bz2 podman-a4fcf09b7ab5daa30b37705702ba2c2e30e8f9c5.zip |
Reenable remote system tests
podman-remote is in better shape now. Let's see what needs
to be done to reenable remote system tests.
- logs test: skip multilog, it doesn't work remote
- diff test: use -l only when local, not with remote
- many other tests: skip_if_remote, with 'FIXME: pending #xxxx'
where xxxx is a filed issue.
Unrelated: added new helper to skip_if_remote and _if_rootless,
where we check if the source message includes "remote"/"rootless"
and insert it if missing. This is a minor usability enhancement
to make it easier to understand at-a-glance why a skip triggers.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/system/140-diff.bats')
-rw-r--r-- | test/system/140-diff.bats | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/test/system/140-diff.bats b/test/system/140-diff.bats index 9f4a2c0de..01ec5430e 100644 --- a/test/system/140-diff.bats +++ b/test/system/140-diff.bats @@ -6,9 +6,16 @@ load helpers @test "podman diff" { + n=$(random_string 10) # container name rand_file=$(random_string 10) - run_podman run $IMAGE sh -c "touch /$rand_file;rm /etc/services" - run_podman diff --format json -l + run_podman run --name $n $IMAGE sh -c "touch /$rand_file;rm /etc/services" + + # If running local, test `-l` (latest) option. This can't work with remote. + if ! is_remote; then + n=-l + fi + + run_podman diff --format json $n # Expected results for each type of diff declare -A expect=( @@ -22,7 +29,7 @@ load helpers is "$result" "${expect[$field]}" "$field" done - run_podman rm -l + run_podman rm $n } # vim: filetype=sh |