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

Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Zanetti
Approved revision: 1754
Merged at revision: 1766
Proposed branch: lp:~aacid/unity8/fixruntests
Merge into: lp:unity8
Diff against target: 12 lines (+3/-0)
1 file modified
runtests.sh (+3/-0)
To merge this branch: bzr merge lp:~aacid/unity8/fixruntests
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+257745@code.launchpad.net

Commit message

Make runtests fake a test error if make fails

This means that we will have 2 errors if there is a test that is run and fails, which is sub-optimal, but at least we'll have also a failure if the test doesn't fail because it was not run for example (i.e. missing dbus-launch).

Description of the change

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

In order to keep qmltests green on CI this should be landed together with:
https://code.launchpad.net/~aacid/unity8/use_dbus_test_runner/+merge/257784
https://code.launchpad.net/~aacid/unity8/more_stable_lvwpht/+merge/257749

 * 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.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/fixruntests updated
1754. By Albert Astals Cid

Instead of failing the .sh create a fake "fail" .xml

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

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

This is just for jenkins, and jenkins behaves as expected now.

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

no, which is the purpose of this branch.

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

yes

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'runtests.sh'
2--- runtests.sh 2013-12-17 17:57:07 +0000
3+++ runtests.sh 2015-05-04 08:46:50 +0000
4@@ -42,6 +42,9 @@
5 cd -
6
7 make -k qmltests
8+if [ $? -ne 0 ]; then
9+ echo '<?xml version="1.0" encoding="UTF-8" ?><testsuite errors="0" failures="1" tests="1" name="makeExitStatusTest"><properties/><testcase result="fail" name="makeExitStatus"><failure message="Make test did not suceed" result="fail"/></testcase><system-err/></testsuite>' > testMakeExitStatus.xml
10+fi
11
12 cd -
13

Subscribers

People subscribed via source and target branches