diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-04 14:58:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-04 14:58:35 +0200 |
| commit | 6aed1076a21bc913210efd1f6ad7377dfd85a9f2 (patch) | |
| tree | 3c5e6fe3267f360704ce5b10237ce884702b16c0 /test/system/140-diff.bats | |
| parent | 7eca5571dc9d39590bc0127f15257921dea30c55 (diff) | |
| parent | a4fcf09b7ab5daa30b37705702ba2c2e30e8f9c5 (diff) | |
| download | podman-6aed1076a21bc913210efd1f6ad7377dfd85a9f2.tar.gz podman-6aed1076a21bc913210efd1f6ad7377dfd85a9f2.tar.bz2 podman-6aed1076a21bc913210efd1f6ad7377dfd85a9f2.zip | |
Merge pull request #7111 from edsantiago/reenable_remote_system_tests
Reenable remote system tests
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 |