diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-01-23 07:10:58 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-01-24 13:15:42 -0500 |
| commit | 1cddd63976b8f266ab4d5088061b7b8cd0f3b412 (patch) | |
| tree | 057eb64ac1817f646e6a3b55b3411d075ddab22b /test/e2e/common_test.go | |
| parent | b75d6baf074a61f2119b8619c86bd2fae1cb2833 (diff) | |
| download | podman-1cddd63976b8f266ab4d5088061b7b8cd0f3b412.tar.gz podman-1cddd63976b8f266ab4d5088061b7b8cd0f3b412.tar.bz2 podman-1cddd63976b8f266ab4d5088061b7b8cd0f3b412.zip | |
Show correct default values or show none
Before this PR, the podman --help command shows the defaults
as runc and overlay even if the storage.conf and containers.conf
files do not match. This PR changes them to show the actual defaults
and in the case of storage driver, does not show the default at all.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'test/e2e/common_test.go')
| -rw-r--r-- | test/e2e/common_test.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 56f050665..796ae8141 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -719,6 +719,14 @@ func SkipIfRemote(reason string) { Skip("[remote]: " + reason) } +func SkipIfNotRemote(reason string) { + checkReason(reason) + if IsRemote() { + return + } + Skip("[local]: " + reason) +} + // SkipIfInContainer skips a test if the test is run inside a container func SkipIfInContainer(reason string) { checkReason(reason) |