Merge lp:~timo-jyrinki/ubuntu-system-settings-online-accounts/fix_qt52_tests into lp:ubuntu-system-settings-online-accounts

[Timo Jyrinki]

Use extra xvfb parameters to fix tests (LP: #1272198)

[Timo Jyrinki (timo-jyrinki)]

Test build at https://launchpad.net/~canonical-qt5-edgers/+archive/qt5-beta2/+sourcepub/3845706/+listing-archive-extra

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:94
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-armhf-ci/25
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-armhf-ci/25/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-online-accounts-trusty-i386-ci/25

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-online-accounts-ci/77/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

Thanks Timo!

review: Approve

=== modified file 'tests/client/tst_client.pro'
--- tests/client/tst_client.pro	2013-08-26 10:53:24 +0000
+++ tests/client/tst_client.pro	2014-01-24 07:36:59 +0000
@@ -21,6 +21,6 @@
 QMAKE_RPATHDIR = $${QMAKE_LIBDIR}
 LIBS += -lonline-accounts-client
 
-check.commands = "xvfb-run -a dbus-test-runner -t ./$${TARGET}"
+check.commands = "xvfb-run -s '-screen 0 640x480x24' -a dbus-test-runner -t ./$${TARGET}"
 check.depends = $${TARGET}
 QMAKE_EXTRA_TARGETS += check

=== modified file 'tests/client/tst_qml_client.pro'
--- tests/client/tst_qml_client.pro	2013-08-26 10:53:24 +0000
+++ tests/client/tst_qml_client.pro	2014-01-24 07:36:59 +0000
@@ -20,6 +20,6 @@
 DEFINES += \
     PLUGIN_PATH=\\\"$${PLUGIN_PATH}\\\"
 
-check.commands = "LD_LIBRARY_PATH=$${TOP_BUILD_DIR}/client/OnlineAccountsClient:${LD_LIBRARY_PATH} xvfb-run -a dbus-test-runner -t ./$${TARGET}"
+check.commands = "LD_LIBRARY_PATH=$${TOP_BUILD_DIR}/client/OnlineAccountsClient:${LD_LIBRARY_PATH} xvfb-run -s '-screen 0 640x480x24' -a dbus-test-runner -t ./$${TARGET}"
 check.depends = $${TARGET}
 QMAKE_EXTRA_TARGETS += check

=== modified file 'tests/online-accounts-ui/qml/qml.pro'
--- tests/online-accounts-ui/qml/qml.pro	2013-09-19 08:08:22 +0000
+++ tests/online-accounts-ui/qml/qml.pro	2014-01-24 07:36:59 +0000
@@ -9,6 +9,6 @@
 SOURCES += \
     tst_online_accounts_qml.cpp
 
-check.commands = "xvfb-run -a dbus-test-runner -t "
+check.commands = "xvfb-run -s '-screen 0 640x480x24' -a dbus-test-runner -t "
 check.depends = $${TARGET}
 QMAKE_EXTRA_TARGETS += check

=== modified file 'tests/online-accounts-ui/tst_inactivity_timer.pro'
--- tests/online-accounts-ui/tst_inactivity_timer.pro	2013-09-11 07:34:28 +0000
+++ tests/online-accounts-ui/tst_inactivity_timer.pro	2014-01-24 07:36:59 +0000
@@ -19,6 +19,6 @@
 INCLUDEPATH += \
     $${TOP_SRC_DIR}/src
 
-check.commands = "xvfb-run -a ./$${TARGET}"
+check.commands = "xvfb-run -s '-screen 0 640x480x24' -a ./$${TARGET}"
 check.depends = $${TARGET}
 QMAKE_EXTRA_TARGETS += check

=== modified file 'tests/online-accounts-ui/tst_service.pro'
--- tests/online-accounts-ui/tst_service.pro	2013-09-17 09:36:46 +0000
+++ tests/online-accounts-ui/tst_service.pro	2014-01-24 07:36:59 +0000
@@ -29,6 +29,6 @@
 INCLUDEPATH += \
     $${TOP_SRC_DIR}/src
 
-check.commands = "xvfb-run -a dbus-test-runner -t ./$${TARGET}"
+check.commands = "xvfb-run -s '-screen 0 640x480x24' -a dbus-test-runner -t ./$${TARGET}"
 check.depends = $${TARGET}
 QMAKE_EXTRA_TARGETS += check