Merge lp:~tiagosh/telephony-service/fix-tests into lp:telephony-service

[Tiago Salem Herrmann]

Fix telephony-service tests.

Fix telephony-service tests.

--------------------
Are there any related MPs required for this MP to build/function as expected? Please list.
No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?
Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/telephony-service) on device or emulator?
Yes

If you changed the UI, was the change specified/approved by design?
N/A

If you changed the packaging (debian), did you subscribe a core-dev to this MP?
N/A

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:789
http://jenkins.qa.ubuntu.com/job/telephony-service-ci/142/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-amd64-ci/66/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/70
        deb: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-armhf-ci/70/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/telephony-service-trusty-i386-ci/66

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes

Code looks good!

review: Approve

[lp:~tiagosh/telephony-service/fix-tests]

789. By Tiago Salem Herrmann on 2014-03-28

Fix telephony-service tests.

=== modified file 'Ubuntu/Telephony/tests/CMakeLists.txt'
--- Ubuntu/Telephony/tests/CMakeLists.txt	2013-08-14 16:18:33 +0000
+++ Ubuntu/Telephony/tests/CMakeLists.txt	2014-03-28 18:01:30 +0000
@@ -10,7 +10,7 @@
         target_link_libraries(${test}
             telephonyservice-qml
             )
-        add_test(${test} ${CMAKE_CURRENT_BINARY_DIR}/${test} -xunitxml -o ${CMAKE_BINARY_DIR}/test_${test}.xml)
+        add_test(${test} ${CMAKE_CURRENT_BINARY_DIR}/${test} -platform offscreen -xunitxml -o ${CMAKE_BINARY_DIR}/test_${test}.xml)
     endforeach(test)
 endmacro(generate_tests)
 

=== modified file 'handler/CMakeLists.txt'
--- handler/CMakeLists.txt	2014-01-07 19:53:45 +0000
+++ handler/CMakeLists.txt	2014-03-28 18:01:30 +0000
@@ -31,4 +31,8 @@
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.canonical.TelephonyServiceHandler.service DESTINATION share/dbus-1/services)
 install(FILES TelephonyServiceHandler.client DESTINATION share/telepathy/clients)
 
-add_subdirectory(tests)
+if(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc*")
+    message(STATUS "Tests disabled on ppc")
+else()
+    add_subdirectory(tests)
+endif()

=== modified file 'handler/tests/HandlerTest.cpp'
--- handler/tests/HandlerTest.cpp	2014-03-11 17:02:06 +0000
+++ handler/tests/HandlerTest.cpp	2014-03-28 18:01:30 +0000
@@ -43,7 +43,7 @@
 void HandlerTest::initTestCase()
 {
     QSignalSpy spy(TelepathyHelper::instance(), SIGNAL(accountReady()));
-    QTRY_COMPARE(spy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 10000);
     QTRY_VERIFY(TelepathyHelper::instance()->connected());
 
     // register the approver

=== modified file 'handler/tests/dbus-test-wrapper.sh.in'
--- handler/tests/dbus-test-wrapper.sh.in	2014-01-22 12:33:43 +0000
+++ handler/tests/dbus-test-wrapper.sh.in	2014-03-28 18:01:30 +0000
@@ -20,7 +20,6 @@
 sleep 1
 
 mc-tool add mock/mock account0
-mc-tool enable mock/mock/account0
 
 @CMAKE_CURRENT_BINARY_DIR@/../telephony-service-handler &
 

=== modified file 'libtelephonyservice/tests/CMakeLists.txt'
--- libtelephonyservice/tests/CMakeLists.txt	2014-02-27 22:35:40 +0000
+++ libtelephonyservice/tests/CMakeLists.txt	2014-03-28 18:01:30 +0000
@@ -35,7 +35,7 @@
         target_link_libraries(${test}
             telephonyservice
             )
-        add_test(${test} ${CMAKE_CURRENT_BINARY_DIR}/${test} -xunitxml -o ${CMAKE_BINARY_DIR}/test_${test}.xml)
+        add_test(${test} ${CMAKE_CURRENT_BINARY_DIR}/${test} -platform offscreen -xunitxml -o ${CMAKE_BINARY_DIR}/test_${test}.xml)
     endforeach(test)
 endmacro(generate_tests)