diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2020-12-06 10:50:13 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2021-02-03 22:52:12 +0100 |
| commit | efae38628bff2b77096db677c4feaacde1dc5438 (patch) | |
| tree | 12d6cb6a8392775f7ac3c39cc31c2136e2682c20 /kwallet | |
| parent | f5adb7979442fd16bc01c01702e86d849a739410 (diff) | |
| download | tdelibs-efae38628bff2b77096db677c4feaacde1dc5438.tar.gz tdelibs-efae38628bff2b77096db677c4feaacde1dc5438.zip | |
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 19f44e5ff3756172540e768fc0d08d761f0c374e)
Diffstat (limited to 'kwallet')
| -rw-r--r-- | kwallet/backend/tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | kwallet/backend/tests/backendtest.sh | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/kwallet/backend/tests/CMakeLists.txt b/kwallet/backend/tests/CMakeLists.txt index 52e2868f0..4cf4d1e34 100644 --- a/kwallet/backend/tests/CMakeLists.txt +++ b/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 ) diff --git a/kwallet/backend/tests/backendtest.sh b/kwallet/backend/tests/backendtest.sh index d3a6ef0e1..d4f1ba686 100644 --- a/kwallet/backend/tests/backendtest.sh +++ b/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=$? |