Merge lp:~dobey/unity-scope-click/temp-no-int-tests into lp:unity-scope-click

Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 413
Merged at revision: 414
Proposed branch: lp:~dobey/unity-scope-click/temp-no-int-tests
Merge into: lp:unity-scope-click
Diff against target: 23 lines (+3/-2)
2 files modified
CMakeLists.txt (+1/-1)
debian/tests/run-tests (+2/-1)
To merge this branch: bzr merge lp:~dobey/unity-scope-click/temp-no-int-tests
Reviewer Review Type Date Requested Status
Paweł Stołowski (community) Approve
Review via email: mp+285079@code.launchpad.net

Commit message

Disable harness tests during build for now.

Description of the change

Disabling running of the scopes harness based tests during normal build for now, in order to improve reliability. The actual cause in scopes-shell seems to be very difficult to track down, so this is an immediate and temporary solution to improve reliability and help avoid unnecessary blocking of landings as a result.

To post a comment you must log in.
Revision history for this message
Paweł Stołowski (stolowski) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-11-24 18:23:23 +0000
3+++ CMakeLists.txt 2016-02-10 17:07:34 +0000
4@@ -66,7 +66,7 @@
5
6 # Custom targets for the tests
7 add_custom_target (test
8- DEPENDS test-click-scope test-apps-scope test-libclickscope test-integration-harness
9+ DEPENDS test-click-scope test-apps-scope test-libclickscope
10 )
11
12 add_custom_target (test-disabled
13
14=== modified file 'debian/tests/run-tests'
15--- debian/tests/run-tests 2015-04-03 19:06:58 +0000
16+++ debian/tests/run-tests 2016-02-10 17:07:34 +0000
17@@ -7,4 +7,5 @@
18 export PYTHONPATH=$PYTHONPATH:`pwd`/tests/common
19 export SCOPE_DIR=/usr/lib/`dpkg-architecture -qDEB_HOST_MULTIARCH`/unity-scopes
20
21-exec tests/scope-harness/run-harness.sh `pwd`/tests/scope-harness
22+# Temporarily disabled due to flakiness of harness: LP: #1532358
23+#exec tests/scope-harness/run-harness.sh `pwd`/tests/scope-harness

Subscribers

People subscribed via source and target branches

to all changes: