From efae38628bff2b77096db677c4feaacde1dc5438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sun, 6 Dec 2020 10:50:13 +0100
Subject: tests: Wait for the dcop server to be ready. Use a separate
 ICEAUTHORITY for tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 19f44e5ff3756172540e768fc0d08d761f0c374e)
---
 dcop/tests/run-tests.sh | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'dcop/tests')

diff --git a/dcop/tests/run-tests.sh b/dcop/tests/run-tests.sh
index dc3640511..0d0b02aad 100644
--- a/dcop/tests/run-tests.sh
+++ b/dcop/tests/run-tests.sh
@@ -10,7 +10,9 @@ clean_up
 # create temporary home
 export HOME=$PWD/test-home
 mkdir $HOME
+export ICEAUTHORITY=$HOME/.ICEauthority
 
+echo '* Starting dcop server'
 ../dcopserver --nofork &
 DCOP_SERVER_PID=$!
 
@@ -22,6 +24,10 @@ die() {
 }
 
 trap 'die "The script interrupted by user"' 2 15
+while ! ../dcopserver --serverid 2>/dev/null; do
+  echo '* Wait for the dcop server'
+  sleep 2
+done
 
 echo '* Running batch mode'
 ./dcop_test --batch >batch.stdout || die "Failed to run dcop_test"
-- 
cgit v1.2.1