From 2957a067eee16a8ec02187bd508ceaed6fdf0c67 Mon Sep 17 00:00:00 2001
From: Martin Pitt <martin@piware.de>
Date: Jul 20 2020 05:38:18 +0000
Subject: tests: Run more upstream integration tests


This requires a workaround for podman.service leaking processes on
shutdown: https://github.com/containers/podman/issues/7021

Some tests don't work in dist-git gating CI environment yet:
testNotRunning, testRunImageSystem, testRunImageUser

Also don't use run-tests yet, this requires
https://github.com/cockpit-project/cockpit-podman/pull/437

---

diff --git a/tests/browser.sh b/tests/browser.sh
index 0775d44..bd04aea 100755
--- a/tests/browser.sh
+++ b/tests/browser.sh
@@ -44,6 +44,10 @@ podman pull docker.io/busybox
 podman pull docker.io/alpine
 podman pull docker.io/registry:2
 
+# HACK: avoid leftover user podman processes between login sessions: https://github.com/containers/podman/issues/7021
+mkdir -p /etc/systemd/user/podman.service.d
+printf '[Service]\nKillMode=\n' > /etc/systemd/user/podman.service.d/cleanup.conf
+
 # pull images for user podman tests; podman insists on user session
 loginctl enable-linger $(id -u admin)
 sudo -i -u admin bash << EOF
diff --git a/tests/run-test.sh b/tests/run-test.sh
index 0e61adb..c05d78d 100755
--- a/tests/run-test.sh
+++ b/tests/run-test.sh
@@ -14,7 +14,8 @@ export TEST_OS="${ID}-${VERSION_ID/./-}"
 export TEST_AUDIT_NO_SELINUX=1
 
 RC=0
-test/check-application -tv --machine 127.0.0.1:22 --browser 127.0.0.1:9090 TestApplication.testBasicSystem || RC=$?
+test/check-application -tv --machine 127.0.0.1:22 --browser 127.0.0.1:9090 \
+    TestApplication.test{BasicSystem,BasicUser,DownloadImage,LifecycleOperationsUser,LifecycleOperationsSystem} || RC=$?
 
 echo $RC > "$LOGS/exitcode"
 cp --verbose Test* "$LOGS" || true