diff options
| author | Ed Santiago <santiago@redhat.com> | 2020-10-19 07:59:02 -0600 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2020-10-19 08:43:56 -0600 |
| commit | b23d430516a20f0274c200c2d67bf0e1b05bff18 (patch) | |
| tree | d34dfbcf3fdc58fa4d48e0857e0549965a73fb3c /test/system/140-diff.bats | |
| parent | 7ffcab0854342844a44b2668bd9d98849bf935c8 (diff) | |
| download | podman-b23d430516a20f0274c200c2d67bf0e1b05bff18.tar.gz podman-b23d430516a20f0274c200c2d67bf0e1b05bff18.tar.bz2 podman-b23d430516a20f0274c200c2d67bf0e1b05bff18.zip | |
System tests: remove some misleading 'run's
The BATS 'run' directive is really quite obnoxious; for the
most part we really don't want to use it. Remove some uses
that snuck in last week, and remove one test (exists) that
can more naturally be piggybacked into an rm test.
While we're at it: in setup(), look for and delete stray
external (buildah) containers. This will be important if
any of the external-container tests fails; this way we
don't leave behind a state that causes subsequent tests
to fail.
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/system/140-diff.bats')
| -rw-r--r-- | test/system/140-diff.bats | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/system/140-diff.bats b/test/system/140-diff.bats index d0f33e438..1277f9bbe 100644 --- a/test/system/140-diff.bats +++ b/test/system/140-diff.bats @@ -34,8 +34,8 @@ load helpers @test "podman diff with buildah container " { rand_file=$(random_string 10) - run buildah from --name buildahctr $IMAGE - run buildah run buildahctr sh -c "touch /$rand_file;rm /etc/services" + buildah from --name buildahctr $IMAGE + buildah run buildahctr sh -c "touch /$rand_file;rm /etc/services" run_podman diff --format json buildahctr @@ -51,7 +51,7 @@ load helpers is "$result" "${expect[$field]}" "$field" done - run buildah rm buildahctr + buildah rm buildahctr } # vim: filetype=sh |