Unity 8

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

  1. singleton_52
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Rejected
Rejected by: Michał Sawicz
Proposed branch: lp:~aacid/unity8/singleton_52
Merge into: lp:unity8
Diff against target: 28 lines (+6/-2)
1 file modified
tests/qmltests/utils/Unity/Test/tst_UnityTest.qml (+6/-2)
To merge this branch: bzr merge lp:~aacid/unity8/singleton_52
Reviewer Review Type Date Requested Status
Michał Sawicz Disapprove
Nick Dedekind (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+194123@code.launchpad.net

Commit message

Comment test that has regressed with Qt 5.2

Fortunately we don't use that function much so the rest of the tests should still work fine

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

FAILED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/unity8-ci/1588/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/518/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/506/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/154
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/112
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/112/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/112
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/478/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/518
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/518/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/506
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/506/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3159/console
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1139

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1588/rebuild

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

PASSED: Continuous integration, rev:502
http://jenkins.qa.ubuntu.com/job/unity8-ci/1610/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/615
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/600
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/187
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/134
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/134/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/133
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/558
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/615
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/615/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/600
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/600/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/3236
    SUCCESS: http://10.97.0.26:8080/job/touch-flash-device/1280

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity8-ci/1610/rebuild

review: Approve (continuous-integration)
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

Not exactly ideal, but it will :)

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

Since we're fixing this upstream, let's not merge this.

review: Disapprove

Unmerged revisions

502. By Albert Astals Cid

Comment test that has regressed with Qt 5.2

Fortunately we don't use that function much so the rest of the tests should still work fine

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/qmltests/utils/Unity/Test/tst_UnityTest.qml'
2--- tests/qmltests/utils/Unity/Test/tst_UnityTest.qml 2013-06-05 22:03:08 +0000
3+++ tests/qmltests/utils/Unity/Test/tst_UnityTest.qml 2013-11-06 12:05:02 +0000
4@@ -31,18 +31,22 @@
5 // Singletons need to be bound to a property and not-named-imported
6 // for them to be able to be properly passed back to C++.
7 // See https://bugreports.qt-project.org/browse/QTBUG-30730
8+ // Qt 5.2 has regressed and the workaround doesn't work anymore
9+ // See https://bugreports.qt-project.org/browse/QTBUG-34617
10 property var util: Util
11
12 function test_direct() {
13 compare(Util.isInstanceOf(rect, "QQuickRectangle"), true, "rect should be an instance of QQuickRectangle");
14- compare(Util.isInstanceOf(util, "TestUtil"), true, "Util should be an instance of TestUtil");
15+ // Uncomment when https://bugreports.qt-project.org/browse/QTBUG-34617 gets fixed
16+// compare(Util.isInstanceOf(util, "TestUtil"), true, "Util should be an instance of TestUtil");
17 compare(Util.isInstanceOf(testObject, "MockObjectForInstanceOfTestChild"), true, "testObject should be an instance of MockObjectForInstanceOfTestChild");
18 }
19
20 function test_inherited() {
21 compare(Util.isInstanceOf(rect, "QQuickItem"), true, "rect should be an instance of QQuickItem");
22 compare(Util.isInstanceOf(rect, "QObject"), true, "rect should be an instance of QObject");
23- compare(Util.isInstanceOf(util, "QObject"), true, "Util should be an instance of QObject");
24+ // Uncomment when https://bugreports.qt-project.org/browse/QTBUG-34617 gets fixed
25+// compare(Util.isInstanceOf(util, "QObject"), true, "Util should be an instance of QObject");
26 compare(Util.isInstanceOf(testObject, "MockObjectForInstanceOfTest"), true, "testObject should be an instance of MockObjectForInstanceOfTest");
27 compare(Util.isInstanceOf(testObject, "QQuickRectangle"), true, "testObject should be an instance of QQuickRectangle");
28 }

Subscribers

People subscribed via source and target branches