Merge lp:~boiko/telephony-service/fix_dbus_tests into lp:telephony-service

[Gustavo Pichorim Boiko]

Make the dbus-based tests more robust.

Make the dbus-based tests more robust.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:765
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/93/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/telephony-service-ci/93/rebuild

review: Approve (continuous-integration)

[Tiago Salem Herrmann (tiagosh)]

looks good.

review: Approve

=== modified file 'handler/tests/CMakeLists.txt'
--- handler/tests/CMakeLists.txt	2014-01-15 19:45:54 +0000
+++ handler/tests/CMakeLists.txt	2014-01-22 12:36:36 +0000
@@ -10,7 +10,6 @@
     if (${USE_DBUS})
         set(TEST_COMMAND -p ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} -p -xunitxml -p -o -p ${CMAKE_BINARY_DIR}/test_${TESTNAME}.xml)
         add_test(${TESTNAME} ${DBUS_RUNNER} --keep-env
-                                            --task dbus-monitor --ignore-return
                                             --task ${CMAKE_CURRENT_BINARY_DIR}/dbus-test-wrapper.sh ${TEST_COMMAND})
     else (${USE_DBUS})
         add_test(${TESTNAME} ${CMAKE_CURRENT_BINARY_DIR}/${TESTNAME} -xunitxml -o ${CMAKE_BINARY_DIR}/test_${TESTNAME}.xml)

=== modified file 'handler/tests/dbus-test-wrapper.sh.in'
--- handler/tests/dbus-test-wrapper.sh.in	2014-01-15 19:45:54 +0000
+++ handler/tests/dbus-test-wrapper.sh.in	2014-01-22 12:36:36 +0000
@@ -16,7 +16,9 @@
 @CMAKE_CURRENT_BINARY_DIR@/mock/telepathy-mock &
 MOCK_PID=$!
 
-mc-tool list
+# wait 1 sec for the mock to start up
+sleep 1
+
 mc-tool add mock/mock account0
 mc-tool enable mock/mock/account0