summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2020-07-28 08:36:52 -0600
committerEd Santiago <santiago@redhat.com>2020-08-03 09:36:36 -0600
commita4fcf09b7ab5daa30b37705702ba2c2e30e8f9c5 (patch)
treeae2f8fc696262c4a0c8dc3398c65c1d7b9f49be9 /Makefile
parent2e3928ee1740c0eb2564ea6bb3004ad5b698ff8f (diff)
downloadpodman-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 'Makefile')
-rw-r--r--Makefile10
1 files changed, 4 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 08a3cddac..70e4a49c7 100644
--- a/Makefile
+++ b/Makefile
@@ -353,21 +353,19 @@ remotesystem:
# Start podman server using tmp socket; loop-wait for it;
# test podman-remote; kill server, clean up tmp socket file.
# podman server spews copious unhelpful output; ignore it.
- # FIXME FIXME FIXME: remove 'exit 0' after #6538 and #6539 are fixed
- exit 0;\
rc=0;\
if timeout -v 1 true; then \
SOCK_FILE=$(shell mktemp --dry-run --tmpdir podman.XXXXXX);\
export PODMAN_SOCKET=unix:$$SOCK_FILE; \
- ./bin/podman system service --timeout=0 $$PODMAN_SOCKET &> $(if $(PODMAN_SERVER_LOG),$(PODMAN_SERVER_LOG),/dev/null) & \
+ ./bin/podman system service --timeout=0 $$PODMAN_SOCKET > $(if $(PODMAN_SERVER_LOG),$(PODMAN_SERVER_LOG),/dev/null) 2>&1 & \
retry=5;\
- while [[ $$retry -ge 0 ]]; do\
+ while [ $$retry -ge 0 ]; do\
echo Waiting for server...;\
sleep 1;\
- ./bin/podman-remote --url $$PODMAN_SOCKET info &>/dev/null && break;\
+ ./bin/podman-remote --url $$PODMAN_SOCKET info >/dev/null 2>&1 && break;\
retry=$$(expr $$retry - 1);\
done;\
- if [[ $$retry -lt 0 ]]; then\
+ if [ $$retry -lt 0 ]; then\
echo "Error: ./bin/podman system service did not come up on $$SOCK_FILE" >&2;\
exit 1;\
fi;\