1 files changed, 24 insertions, 26 deletions
diff --git a/test/varlink/run_varlink_tests.sh b/test/varlink/run_varlink_tests.sh
index 9c247fec2..8372de10b 100644..100755
--- a/test/varlink/run_varlink_tests.sh
+++ b/test/varlink/run_varlink_tests.sh
@@ -1,37 +1,35 @@
 #!/bin/bash
 
-set -x
 if [ ! -n "${PYTHON+ }" ]; then
-    if hash python3 > /dev/null 2>&1 /dev/null; then
-        PYTHON=$(hash -t python3)
-    elif type python3 > /dev/null 2>&1; then
-        PYTHON=$(type python3 | awk '{print $3}')
-    elif hash python2 > /dev/null 2>&1; then
-        PYTHON=$(hash -t python2)
-    elif type python2 > /dev/null 2>&1; then
-        PYTHON=$(type python2 | awk '{print $3}')
-    else
-        PYTHON='/usr/bin/python'
-    fi
+  if hash python3 > /dev/null 2>&1; then
+    PYTHON=$(hash -t python3)
+  elif type python3 > /dev/null 2>&1; then
+    PYTHON=$(type python3 | awk '{print $3}')
+  elif hash python2 > /dev/null 2>&1; then
+    PYTHON=$(hash -t python2)
+  elif type python2 > /dev/null 2>&1; then
+    PYTHON=$(type python2 | awk '{print $3}')
+  else
+    PYTHON='/usr/bin/python'
+  fi
 fi
 
 # Create temporary directory for storage
-TMPSTORAGE=`mktemp -d`
-
-# Need a location to store the podman socket
-mkdir /run/podman
+TMPSTORAGE=`mktemp -d /tmp/podman.XXXXXXXXXX`
+trap 'rm -fr ${TMPSTORAGE}' EXIT
 
-# Run podman in background without systemd for test purposes
-bin/podman --storage-driver=vfs --root=${TMPSTORAGE}/crio --runroot=${TMPSTORAGE}/crio-run varlink unix:/run/podman/io.projectatomic.podman&
+export PODMAN_HOST="unix:${TMPSTORAGE}/podman/io.projectatomic.podman"
 
-# Record podman's pid to be killed later
-PODMAN_PID=`echo $!`
+# Need a location to store the podman socket
+mkdir -p ${TMPSTORAGE}/podman
 
-# Run tests
-${PYTHON} -m unittest discover -s test/varlink/
+systemd-cat -t podman -p notice bin/podman --version
 
-# Kill podman
-kill -9 ${PODMAN_PID}
+set -x
+# Run podman in background without systemd for test purposes
+systemd-cat -t podman -p notice \
+  bin/podman --storage-driver=vfs --root=${TMPSTORAGE}/crio \
+  --runroot=${TMPSTORAGE}/crio-run varlink ${PODMAN_HOST} &
 
-# Clean up
-rm -fr ${TMPSTORAGE}
+${PYTHON} -m unittest discover -s test/varlink/ $@
+pkill podman