diff options
author | Ed Santiago <santiago@redhat.com> | 2019-08-07 14:24:23 -0600 |
---|---|---|
committer | Ed Santiago <santiago@redhat.com> | 2019-08-08 11:44:55 -0600 |
commit | 5c108cdab4888c53fbe7d4cb546544cc5a4929aa (patch) | |
tree | 8959a746011ee94b552379da04f7749db096d160 /test/system/helpers.bash | |
parent | 3959a357f7cefc9e3494042781fe0978e621cccc (diff) | |
download | podman-5c108cdab4888c53fbe7d4cb546544cc5a4929aa.tar.gz podman-5c108cdab4888c53fbe7d4cb546544cc5a4929aa.tar.bz2 podman-5c108cdab4888c53fbe7d4cb546544cc5a4929aa.zip |
implement 'make remotesystem'
podman-remote rm now works; that's the only thing we were
waiting for to enable podman-remote (varlink) system tests.
Add a (too-complicated, sorry) Makefile target that will
define a random socket path, start the podman varlink server,
and run the test suite using podman-remote.
Also: add two convenience functions, is_rootless and is_remote,
and use those in skip_if_rootless/if_remote and elsewhere
Also: workarounds for broken tests:
- basic version test: podman-remote emits an empty 'Client'
line. Just ignore it.
- looks like 'podman-remote pod' doesn't work; skip test.
Also: minor documentation update
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'test/system/helpers.bash')
-rw-r--r-- | test/system/helpers.bash | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/test/system/helpers.bash b/test/system/helpers.bash index fe0a25b37..3d607f4bd 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -216,26 +216,31 @@ function wait_for_ready { ############################################################################### # BEGIN miscellaneous tools +# Shortcuts for common needs: +function is_rootless() { + [ "$(id -u)" -ne 0 ] +} + +function is_remote() { + [[ "$PODMAN" =~ -remote ]] +} + ###################### # skip_if_rootless # ...with an optional message ###################### function skip_if_rootless() { - if [ "$(id -u)" -eq 0 ]; then - return + if is_rootless; then + skip "${1:-not applicable under rootless podman}" fi - - skip "${1:-not applicable under rootless podman}" } #################### # skip_if_remote # ...with an optional message #################### function skip_if_remote() { - if [[ ! "$PODMAN" =~ -remote ]]; then - return + if is_remote; then + skip "${1:-test does not work with podman-remote}" fi - - skip "${1:-test does not work with podman-remote}" } ######################### |