Unity API

Merge lp:~aacid/unity-api/52regressions into lp:unity-api

  1. 52regressions
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Rejected
Rejected by: Michał Sawicz
Proposed branch: lp:~aacid/unity-api/52regressions
Merge into: lp:unity-api
Diff against target: 82 lines (+16/-7)
4 files modified
test/qmltest/modules/TestUtil/test/tst_TestUtil.qml (+6/-2)
test/qmltest/unity/shell/application/tst_Application.qml (+2/-1)
test/qmltest/unity/shell/launcher/tst_Launcher.qml (+2/-1)
test/qmltest/unity/shell/notifications/tst_Notifications.qml (+6/-3)
To merge this branch: bzr merge lp:~aacid/unity-api/52regressions
Reviewer Review Type Date Requested Status
Michał Sawicz Disapprove
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+194303@code.launchpad.net

Commit message

Comment out tests that are broken in Qt 5.2

The singleton handling in Qt 5.2 seems to have regressed a bit, fortunately
we only seem to be using them for the tests

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:111
http://jenkins.qa.ubuntu.com/job/unity-api-ci/131/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-trusty-i386-ci/5

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-api-ci/131/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

Since we're actually fixing this upstream, I'm gonna disapprove.

review: Disapprove

Unmerged revisions

111. By Albert Astals Cid

Comment out tests that are broken in Qt 5.2

The singleton handling in Qt 5.2 seems to have regressed a bit, fortunately
we only seem to be using them for the tests

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'test/qmltest/modules/TestUtil/test/tst_TestUtil.qml'
--- test/qmltest/modules/TestUtil/test/tst_TestUtil.qml 2013-06-26 23:47:34 +0000
+++ test/qmltest/modules/TestUtil/test/tst_TestUtil.qml 2013-11-07 09:52:31 +0000
@@ -31,18 +31,22 @@
31 // Singletons need to be bound to a property and not-named-imported31 // Singletons need to be bound to a property and not-named-imported
32 // for them to be able to be properly passed back to C++.32 // for them to be able to be properly passed back to C++.
33 // See https://bugreports.qt-project.org/browse/QTBUG-3073033 // See https://bugreports.qt-project.org/browse/QTBUG-30730
34 // Qt 5.2 has regressed and the workaround doesn't work anymore
35 // See https://bugreports.qt-project.org/browse/QTBUG-34617
34 property var util: Util36 property var util: Util
3537
36 function test_direct() {38 function test_direct() {
37 compare(Util.isInstanceOf(rect, "QQuickRectangle"), true, "rect should be an instance of QQuickRectangle");39 compare(Util.isInstanceOf(rect, "QQuickRectangle"), true, "rect should be an instance of QQuickRectangle");
38 compare(Util.isInstanceOf(util, "TestUtil"), true, "Util should be an instance of TestUtil");40 // FIXME Uncomment when https://bugreports.qt-project.org/browse/QTBUG-34617 gets fixed
41// compare(Util.isInstanceOf(util, "TestUtil"), true, "Util should be an instance of TestUtil");
39 compare(Util.isInstanceOf(testObject, "MockObjectForInstanceOfTestChild"), true, "testObject should be an instance of MockObjectForInstanceOfTestChild");42 compare(Util.isInstanceOf(testObject, "MockObjectForInstanceOfTestChild"), true, "testObject should be an instance of MockObjectForInstanceOfTestChild");
40 }43 }
4144
42 function test_inherited() {45 function test_inherited() {
43 compare(Util.isInstanceOf(rect, "QQuickItem"), true, "rect should be an instance of QQuickItem");46 compare(Util.isInstanceOf(rect, "QQuickItem"), true, "rect should be an instance of QQuickItem");
44 compare(Util.isInstanceOf(rect, "QObject"), true, "rect should be an instance of QObject");47 compare(Util.isInstanceOf(rect, "QObject"), true, "rect should be an instance of QObject");
45 compare(Util.isInstanceOf(util, "QObject"), true, "Util should be an instance of QObject");48 // FIXME Uncomment when https://bugreports.qt-project.org/browse/QTBUG-34617 gets fixed
49// compare(Util.isInstanceOf(util, "QObject"), true, "Util should be an instance of QObject");
46 compare(Util.isInstanceOf(testObject, "MockObjectForInstanceOfTest"), true, "testObject should be an instance of MockObjectForInstanceOfTest");50 compare(Util.isInstanceOf(testObject, "MockObjectForInstanceOfTest"), true, "testObject should be an instance of MockObjectForInstanceOfTest");
47 compare(Util.isInstanceOf(testObject, "QQuickRectangle"), true, "testObject should be an instance of QQuickRectangle");51 compare(Util.isInstanceOf(testObject, "QQuickRectangle"), true, "testObject should be an instance of QQuickRectangle");
48 }52 }
4953
=== modified file 'test/qmltest/unity/shell/application/tst_Application.qml'
--- test/qmltest/unity/shell/application/tst_Application.qml 2013-09-09 10:59:06 +0000
+++ test/qmltest/unity/shell/application/tst_Application.qml 2013-11-07 09:52:31 +0000
@@ -36,7 +36,8 @@
36 function test_model_data() {36 function test_model_data() {
37 return [37 return [
38 { tag: "ApplicationManager[object]", type: "object" },38 { tag: "ApplicationManager[object]", type: "object" },
39 { tag: "ApplicationManager[ApplicationManagerInterface]", type: "unity::shell::application::ApplicationManagerInterface" },39 // FIXME Uncomment when https://bugreports.qt-project.org/browse/QTBUG-34617 gets fixed
40// { tag: "ApplicationManager[ApplicationManagerInterface]", type: "unity::shell::application::ApplicationManagerInterface" },
40 ];41 ];
41 }42 }
4243
4344
=== modified file 'test/qmltest/unity/shell/launcher/tst_Launcher.qml'
--- test/qmltest/unity/shell/launcher/tst_Launcher.qml 2013-09-11 15:28:22 +0000
+++ test/qmltest/unity/shell/launcher/tst_Launcher.qml 2013-11-07 09:52:31 +0000
@@ -36,7 +36,8 @@
36 function test_model_data() {36 function test_model_data() {
37 return [37 return [
38 { tag: "LauncherModel[object]", type: "object" },38 { tag: "LauncherModel[object]", type: "object" },
39 { tag: "LauncherModel[LauncherModelInterface]", type: "unity::shell::launcher::LauncherModelInterface" },39 // FIXME Uncomment when https://bugreports.qt-project.org/browse/QTBUG-34617 gets fixed
40// { tag: "LauncherModel[LauncherModelInterface]", type: "unity::shell::launcher::LauncherModelInterface" },
40 ];41 ];
41 }42 }
4243
4344
=== modified file 'test/qmltest/unity/shell/notifications/tst_Notifications.qml'
--- test/qmltest/unity/shell/notifications/tst_Notifications.qml 2013-06-26 23:47:34 +0000
+++ test/qmltest/unity/shell/notifications/tst_Notifications.qml 2013-11-07 09:52:31 +0000
@@ -71,7 +71,8 @@
71 function test_model_data() {71 function test_model_data() {
72 return [72 return [
73 { tag: "Model[object]", type: "object" },73 { tag: "Model[object]", type: "object" },
74 { tag: "Model[ModelInterface]", type: "unity::shell::notifications::ModelInterface" },74 // FIXME Uncomment when https://bugreports.qt-project.org/browse/QTBUG-34617 gets fixed
75// { tag: "Model[ModelInterface]", type: "unity::shell::notifications::ModelInterface" },
75 { tag: "Model.confirmationPlaceholder", writable: "confirmationPlaceholder",76 { tag: "Model.confirmationPlaceholder", writable: "confirmationPlaceholder",
76 type: "boolean", value: !Model.confirmationPlaceholder }77 type: "boolean", value: !Model.confirmationPlaceholder }
77 ];78 ];
@@ -87,8 +88,10 @@
87 function test_source_data() {88 function test_source_data() {
88 return [89 return [
89 { tag: "Source[object]", type: "object" },90 { tag: "Source[object]", type: "object" },
90 { tag: "Source[SourceInterface]", type: "unity::shell::notifications::SourceInterface" },91 // FIXME Uncomment when https://bugreports.qt-project.org/browse/QTBUG-34617 gets fixed
91 { tag: "Source.model", writable: "model", type: "object", value: model },92// { tag: "Source[SourceInterface]", type: "unity::shell::notifications::SourceInterface" },
93 // FIXME: Uncomment when https://bugreports.qt-project.org/browse/QTBUG-34651 gets fixed
94// { tag: "Source.model", writable: "model", type: "object", value: model },
92 ];95 ];
93 }96 }
9497

Subscribers

People subscribed via source and target branches

to all changes: