tests: Wait for the dcop server to be ready.

Use a separate ICEAUTHORITY for tests.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 19f44e5ff3)

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"

kio/tests/CMakeLists.txt

@@ -80,6 +80,7 @@ configure_file( kmimetypetest.sh.cmake kmimetypetest.sh @ONLY )
 add_test( NAME "kio/kmimetypetest"
     COMMAND sh -x "${CMAKE_CURRENT_BINARY_DIR}/kmimetypetest.sh"
     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}" )
+set_tests_properties( "kio/kmimetypetest" PROPERTIES TIMEOUT 30)
 
 
 # TODO add kdirwatchunittest

kio/tests/kmimetypetest.sh.cmake

@@ -5,11 +5,16 @@ HOME=@CMAKE_CURRENT_BINARY_DIR@/test-home
 mkdir $HOME $HOME/.trinity $HOME/.trinity/share
 ln -s @CMAKE_SOURCE_DIR@/mimetypes $HOME/.trinity/share/mimelnk
 export HOME
+export ICEAUTHORITY=$HOME/.ICEauthority
 
 # run dcop server
 ../../dcop/dcopserver --nofork &
 DCOP_SERVER_PID=$!
 
+while ! ../../dcop/dcopserver --serverid 2>/dev/null; do
+  sleep 2
+done
+
 # update ksycoca using mime types from source
 ../../kded/kbuildsycoca --noincremental --nosignal
 

kwallet/backend/tests/CMakeLists.txt

@@ -29,6 +29,7 @@ tde_add_check_executable( backendtest AUTOMOC
     LINK kwalletbackend-shared kwalletclient-shared )
 add_test( NAME "kwallet/backed/backendtest"
     COMMAND sh -x "${CMAKE_CURRENT_SOURCE_DIR}/backendtest.sh" )
+set_tests_properties( "kwallet/backed/backendtest" PROPERTIES TIMEOUT 30)
 tde_add_check_executable( testbf AUTOMOC
     SOURCES testbf.cpp ../blockcipher.cc ../blowfish.cc
     LINK kwalletbackend-shared kwalletclient-shared TEST )

kwallet/backend/tests/backendtest.sh

@@ -3,11 +3,16 @@
 # create temporary home
 export HOME=$PWD/test-home
 mkdir $HOME
+export ICEAUTHORITY=$HOME/.ICEauthority
 
 # run dcop server
 ../../../dcop/dcopserver --nofork &
 DCOP_SERVER_PID=$!
 
+while ! ../../../dcop/dcopserver --serverid 2>/dev/null; do
+  sleep 2
+done
+
 # perform test
 ./backendtest
 STATE=$?