Unity 8

Merge lp:~aacid/unity8/use_dbus_test_runner into lp:unity8

  1. use_dbus_test_runner
  2. Merge into trunk
Proposed by Albert Astals Cid on 2015-04-28
Status: Superseded
Proposed branch: lp:~aacid/unity8/use_dbus_test_runner
Merge into: lp:unity8
Diff against target: 53 lines (+13/-8)
2 files modified
cmake/modules/QmlTest.cmake (+10/-8)
runtests.sh (+3/-0)
To merge this branch: bzr merge lp:~aacid/unity8/use_dbus_test_runner
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing on 2015-04-29
Michael Zanetti 2015-04-28 Pending
Review via email: mp+257675@code.launchpad.net

This proposal has been superseded by a proposal from 2015-04-29.

Commit Message

Use dbus-test-runner instead of dbus-launch

Since we actually depend on it in the control file

Description of the Change

 * Are there any related MPs required for this MP to build/function as expected?
Ni

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

To post a comment you must log in.
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1753
http://jenkins.qa.ubuntu.com/job/unity8-ci/5631/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2498
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/794
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/796
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/796
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2167
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2496
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2496/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/19988

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5631/rebuild

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/use_dbus_test_runner updated on 2015-04-29
1753. By Albert Astals Cid on 2015-04-29

Use dbus-test-runner instead of dbus-launch

Since we actually depend on it in the control file

1754. By Albert Astals Cid on 2015-04-29

Increase max time since we have long running tests

PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1754
http://jenkins.qa.ubuntu.com/job/unity8-ci/5633/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2517
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/796
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/798
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/798
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2179
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2515
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2515/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20006

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5633/rebuild

review: Needs Fixing (continuous-integration)
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1754
http://jenkins.qa.ubuntu.com/job/unity8-ci/5636/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2521
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/799
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/801
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/801
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2183
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2519
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2519/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/20012

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5636/rebuild

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/use_dbus_test_runner updated on 2015-05-04
1755. By Albert Astals Cid on 2015-04-29

Merge lp:~aacid/unity8/fixruntests

1756. By Albert Astals Cid on 2015-05-04

Merge fixruntests

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/modules/QmlTest.cmake'
2--- cmake/modules/QmlTest.cmake 2015-02-05 20:21:00 +0000
3+++ cmake/modules/QmlTest.cmake 2015-04-29 15:51:32 +0000
4@@ -155,10 +155,11 @@
5 set(testCommand
6 ${ENVVAR}
7 LD_LIBRARY_PATH=${LD_PATH}
8- dbus-launch
9- ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
10- -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
11- -o -,txt)
12+ dbus-test-runner
13+ -m 300
14+ -t ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
15+ -p -o -p ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
16+ -p -o -p -,txt)
17
18 add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
19 add_dependencies(test${CLASS_NAME} ${CLASS_NAME}TestExec ${DEPS})
20@@ -173,10 +174,11 @@
21 ${ENVVAR}
22 LD_LIBRARY_PATH=${LD_PATH}
23 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
24- dbus-launch
25- ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
26- -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
27- -o -,txt)
28+ dbus-test-runner
29+ -m 300
30+ -t ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
31+ -p -o -p ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
32+ -p -o -p -,txt)
33
34 add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)
35 add_dependencies(qmluitests xvfbtest${CLASS_NAME})
36
37=== modified file 'runtests.sh'
38--- runtests.sh 2013-12-17 17:57:07 +0000
39+++ runtests.sh 2015-04-29 15:51:32 +0000
40@@ -42,6 +42,7 @@
41 cd -
42
43 make -k qmltests
44+makeresult=$?
45
46 cd -
47
48@@ -134,3 +135,5 @@
49 echo " </package>" >> $coveragefile
50 echo " </packages>" >> $coveragefile
51 echo "</coverage>" >> $coveragefile
52+
53+exit $makeresult

Subscribers

People subscribed via source and target branches