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> | 2020-12-06 10:50:13 +0100 |
| commit | 19f44e5ff3756172540e768fc0d08d761f0c374e (patch) | |
| tree | 962f74609254b68bdf67dbd25e91421fbaedfbce /tdewallet | |
| parent | 1f1bd93ca8a699e5acae0b9dc7d9ee25189954d9 (diff) | |
| download | tdelibs-19f44e5ff3756172540e768fc0d08d761f0c374e.tar.gz tdelibs-19f44e5ff3756172540e768fc0d08d761f0c374e.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>
Diffstat (limited to 'tdewallet')
| -rw-r--r-- | tdewallet/backend/tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tdewallet/backend/tests/backendtest.sh | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/tdewallet/backend/tests/CMakeLists.txt b/tdewallet/backend/tests/CMakeLists.txt index 275891ae7..abc703a7c 100644 --- a/tdewallet/backend/tests/CMakeLists.txt +++ b/tdewallet/backend/tests/CMakeLists.txt @@ -29,6 +29,7 @@ tde_add_check_executable( backendtest AUTOMOC LINK tdewalletbackend-shared tdewalletclient-shared ) add_test( NAME "tdewallet/backed/backendtest" COMMAND sh -x "${CMAKE_CURRENT_SOURCE_DIR}/backendtest.sh" ) +set_tests_properties( "tdewallet/backed/backendtest" PROPERTIES TIMEOUT 30) tde_add_check_executable( testbf AUTOMOC SOURCES testbf.cpp ../blockcipher.cc ../blowfish.cc LINK tdewalletbackend-shared tdewalletclient-shared TEST ) diff --git a/tdewallet/backend/tests/backendtest.sh b/tdewallet/backend/tests/backendtest.sh index d3a6ef0e1..d4f1ba686 100644 --- a/tdewallet/backend/tests/backendtest.sh +++ b/tdewallet/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=$? |