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

Proposed by Albert Astals Cid on 2014-08-06
Status: Merged
Approved by: Michał Sawicz on 2014-08-06
Approved revision: 1116
Merged at revision: 1132
Proposed branch: lp:~aacid/unity8/prepend_test_xml
Merge into: lp:unity8
Diff against target: 57 lines (+4/-3)
4 files modified
cmake/modules/QmlTest.cmake (+2/-2)
plugins/Dash/CardCreator.js (+0/-1)
qml/Dash/DashApplication.qml (+1/-0)
qml/ScopeTool.qml (+1/-0)
To merge this branch: bzr merge lp:~aacid/unity8/prepend_test_xml
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing on 2014-08-07
Michał Sawicz 2014-08-06 Approve on 2014-08-06
Review via email: mp+229766@code.launchpad.net

Commit message

Add test prefix to xml output, seems CI needs it

Description of the change

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

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

 * 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.
Michał Sawicz (saviq) :
review: Needs Fixing
Albert Astals Cid (aacid) wrote :

Suffix dropped

lp:~aacid/unity8/prepend_test_xml updated on 2014-08-06
1116. By Albert Astals Cid on 2014-08-06

drop Test suffix

Michał Sawicz (saviq) wrote :

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

 * Did CI run pass? If not, please explain why.
Not yet, but this can't cause anything.

review: Approve
Michał Sawicz (saviq) wrote :

WooHoo, almost 50% more tests reported ;)

Albert Astals Cid (aacid) wrote :

Now we'll have to fix this test :D

lp:~aacid/unity8/prepend_test_xml updated on 2014-08-06
1117. By Albert Astals Cid on 2014-08-06

Move the declaration of Ubuntu.Thumbnailer 0.1 to the application root file

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 2014-07-29 16:14:51 +0000
3+++ cmake/modules/QmlTest.cmake 2014-08-06 19:30:14 +0000
4@@ -135,7 +135,7 @@
5 set(testCommand
6 LD_LIBRARY_PATH=${LD_PATH}
7 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
8- -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml
9+ -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
10 -o -,txt)
11
12 add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
13@@ -151,7 +151,7 @@
14 LD_LIBRARY_PATH=${LD_PATH}
15 xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
16 ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
17- -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml
18+ -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
19 -o -,txt)
20
21 add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)
22
23=== modified file 'plugins/Dash/CardCreator.js'
24--- plugins/Dash/CardCreator.js 2014-07-28 09:28:50 +0000
25+++ plugins/Dash/CardCreator.js 2014-08-06 19:30:14 +0000
26@@ -593,7 +593,6 @@
27 function createCardComponent(parent, template, components) {
28 var imports = 'import QtQuick 2.2; \n\
29 import Ubuntu.Components 0.1; \n\
30- import Ubuntu.Thumbnailer 0.1;\n\
31 import Dash 0.1;\n';
32 var card = cardString(template, components);
33 var code = imports + 'Component {\n' + card + '}\n';
34
35=== modified file 'qml/Dash/DashApplication.qml'
36--- qml/Dash/DashApplication.qml 2014-07-29 14:28:16 +0000
37+++ qml/Dash/DashApplication.qml 2014-08-06 19:30:14 +0000
38@@ -16,6 +16,7 @@
39
40 import QtQuick 2.2
41 import Ubuntu.Components 1.0
42+import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
43
44 MainView {
45 width: units.gu(40)
46
47=== modified file 'qml/ScopeTool.qml'
48--- qml/ScopeTool.qml 2014-07-03 09:08:22 +0000
49+++ qml/ScopeTool.qml 2014-08-06 19:30:14 +0000
50@@ -17,6 +17,7 @@
51 import QtQuick 2.0
52 import Ubuntu.Components 0.1
53 import Ubuntu.Components.Popups 0.1
54+import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
55 import Utils 0.1
56 import Unity 0.2
57 import "Components"

Subscribers

People subscribed via source and target branches