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

[Albert Astals Cid]

Add test prefix to xml output, seems CI needs it

 * 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

[Michał Sawicz (saviq)]

review: Needs Fixing

[Albert Astals Cid (aacid)]

Suffix dropped

[lp:~aacid/unity8/prepend_test_xml]

1116. By Albert Astals Cid on 2014-08-06

drop Test suffix

[Michał Sawicz (saviq)]

 * 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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1115
http://jenkins.qa.ubuntu.com/job/unity8-ci/3793/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3099
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/887
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/887
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/887/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/887
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3136
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4343
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4343/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11081

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

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

WooHoo, almost 50% more tests reported ;)

[Albert Astals Cid (aacid)]

Now we'll have to fix this test :D

[lp:~aacid/unity8/prepend_test_xml]

1117. By Albert Astals Cid on 2014-08-06

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

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1115
http://jenkins.qa.ubuntu.com/job/unity8-ci/3807/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/3157
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/809
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/901
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/901
        deb: http://jenkins.qa.ubuntu.com/job/unity8-utopic-armhf-ci/901/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/901
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/3187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4402
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/4402/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/11147

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

review: Needs Fixing (continuous-integration)

=== modified file 'cmake/modules/QmlTest.cmake'
--- cmake/modules/QmlTest.cmake	2014-07-29 16:14:51 +0000
+++ cmake/modules/QmlTest.cmake	2014-08-06 19:30:14 +0000
@@ -135,7 +135,7 @@
     set(testCommand
           LD_LIBRARY_PATH=${LD_PATH}
           ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
-          -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml
+          -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
           -o -,txt)
 
     add_qmltest_target(test${CLASS_NAME} "${testCommand}" FALSE TRUE)
@@ -151,7 +151,7 @@
           LD_LIBRARY_PATH=${LD_PATH}
           xvfb-run --server-args "-screen 0 1024x768x24" --auto-servernum
           ${CMAKE_CURRENT_BINARY_DIR}/${CLASS_NAME}TestExec
-          -o ${CMAKE_BINARY_DIR}/${CLASS_NAME}Test.xml,xunitxml
+          -o ${CMAKE_BINARY_DIR}/test${CLASS_NAME}.xml,xunitxml
           -o -,txt)
 
     add_qmltest_target(xvfbtest${CLASS_NAME} "${xvfbtestCommand}" FALSE TRUE)

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2014-07-28 09:28:50 +0000
+++ plugins/Dash/CardCreator.js	2014-08-06 19:30:14 +0000
@@ -593,7 +593,6 @@
 function createCardComponent(parent, template, components) {
     var imports = 'import QtQuick 2.2; \n\
                    import Ubuntu.Components 0.1; \n\
-                   import Ubuntu.Thumbnailer 0.1;\n\
                    import Dash 0.1;\n';
     var card = cardString(template, components);
     var code = imports + 'Component {\n' + card + '}\n';

=== modified file 'qml/Dash/DashApplication.qml'
--- qml/Dash/DashApplication.qml	2014-07-29 14:28:16 +0000
+++ qml/Dash/DashApplication.qml	2014-08-06 19:30:14 +0000
@@ -16,6 +16,7 @@
 
 import QtQuick 2.2
 import Ubuntu.Components 1.0
+import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
 
 MainView {
     width: units.gu(40)

=== modified file 'qml/ScopeTool.qml'
--- qml/ScopeTool.qml	2014-07-03 09:08:22 +0000
+++ qml/ScopeTool.qml	2014-08-06 19:30:14 +0000
@@ -17,6 +17,7 @@
 import QtQuick 2.0
 import Ubuntu.Components 0.1
 import Ubuntu.Components.Popups 0.1
+import Ubuntu.Thumbnailer 0.1 // Register support for image://thumbnailer/ and image://albumart/
 import Utils 0.1
 import Unity 0.2
 import "Components"