Unity 8

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

  1. testCyclePreviewBroken
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michael Zanetti
Approved revision: 657
Merged at revision: 698
Proposed branch: lp:~aacid/unity8/testCyclePreviewBroken
Merge into: lp:unity8
Diff against target: 97 lines (+18/-10)
2 files modified
qml/Dash/PreviewListView.qml (+1/-0)
tests/qmltests/Dash/tst_GenericScopeView.qml (+17/-10)
To merge this branch: bzr merge lp:~aacid/unity8/testCyclePreviewBroken
Reviewer Review Type Date Requested Status
Michael Zanetti (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Unity Team Pending
Review via email: mp+203529@code.launchpad.net

Commit message

Fix test_previewCycle

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, it's only fixing a test, doesn't change anything in exploratory manual test run

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
  It's a test fix, does not change debian folder

* If you changed the UI, has there been a design review?
  It's a test fix, does not change the UI

To post a comment you must log in.
Revision history for this message
Michael Zanetti (mzanetti) wrote :

lgtm.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:654
http://jenkins.qa.ubuntu.com/job/unity8-ci/2143/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2671
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2450
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1016
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/665
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/667
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/667/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/665
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2339
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2673
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2673/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2451
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2451/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4890
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3410

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

revoking my approval until ci passes...

review: Abstain
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:654
http://jenkins.qa.ubuntu.com/job/unity8-ci/2163/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2722
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2488/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1036
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/685
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/687
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/687/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/685
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2383
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2724
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2724/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2489
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2489/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4925/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3454

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

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/testCyclePreviewBroken updated
655. By Albert Astals Cid

Merge

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:655
http://jenkins.qa.ubuntu.com/job/unity8-ci/2167/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2737
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2501/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1040
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/689
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/691
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/691/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/689
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2396
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2739
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2739/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2502
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2502/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4936/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3469

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

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/testCyclePreviewBroken updated
656. By Albert Astals Cid

Make tests be gentler to the next test

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:656
http://jenkins.qa.ubuntu.com/job/unity8-ci/2169/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2743
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2507/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1042
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/691
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/693
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/693/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/691
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2400
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2745
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2745/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2508
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2508/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4940/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3473

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

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

FAILED: Continuous integration, rev:656
http://jenkins.qa.ubuntu.com/job/unity8-ci/2181/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2768
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2529
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1054
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/703
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/705
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/705/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/703
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2419
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2770
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2770/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2530
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2530/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/4958
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3494

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

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

FAILED: Continuous integration, rev:656
http://jenkins.qa.ubuntu.com/job/unity8-ci/2203/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2833
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2581
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1076
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/725
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/727
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/727/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/725
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2481
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2835
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2835/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2582
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2582/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5007
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3551

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

review: Needs Fixing (continuous-integration)
lp:~aacid/unity8/testCyclePreviewBroken updated
657. By Albert Astals Cid

Merge

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:657
http://jenkins.qa.ubuntu.com/job/unity8-ci/2232/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/2904
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2646/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1103
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/754
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/756
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/756/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/754
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2549
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2906
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/2906/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2647
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2647/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5072/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3632

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

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

FAILED: Continuous integration, rev:657
http://jenkins.qa.ubuntu.com/job/unity8-ci/2273/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3010/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2742
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/795
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/797
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/797/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/795
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2646/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3012
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3012/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2743
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2743/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5161
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3747

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

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

PASSED: Continuous integration, rev:657
http://jenkins.qa.ubuntu.com/job/unity8-ci/2275/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty/3012
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-trusty-touch/2744
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-trusty/1146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-amd64-ci/797
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/799
        deb: http://jenkins.qa.ubuntu.com/job/unity8-trusty-armhf-ci/799/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-trusty-i386-ci/797
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-trusty/2649
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3014
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-amd64/3014/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2745
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-trusty-armhf/2745/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/5163
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/3750

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

review: Approve (continuous-integration)
Revision history for this message
Michael Zanetti (mzanetti) wrote :

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

Yes, functionality unchanged. Tests working properly again.

 * Did CI run pass? If not, please explain why.

Yip Yip!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Dash/PreviewListView.qml'
2--- qml/Dash/PreviewListView.qml 2014-01-07 16:36:31 +0000
3+++ qml/Dash/PreviewListView.qml 2014-02-05 08:18:37 +0000
4@@ -32,6 +32,7 @@
5 property alias model: previewListView.model
6 property alias currentIndex: previewListView.currentIndex
7 property alias currentItem: previewListView.currentItem
8+ property alias count: previewListView.count
9
10 Image {
11 objectName: "pointerArrow"
12
13=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
14--- tests/qmltests/Dash/tst_GenericScopeView.qml 2014-02-03 19:18:05 +0000
15+++ tests/qmltests/Dash/tst_GenericScopeView.qml 2014-02-05 08:18:37 +0000
16@@ -41,17 +41,10 @@
17 signal mainStageFocusedApplicationChanged()
18 }
19
20- PreviewListView {
21- id: previewListView
22- anchors.fill: parent
23- openEffect: openEffect
24- categoryView: genericScopeView.categoryView
25- scope: genericScopeView.scope
26- }
27-
28 DashContentOpenEffect {
29 id: openEffect
30 previewListView: previewListView
31+ sourceItem: genericScopeView
32 }
33
34 PageHeaderLabel {
35@@ -110,6 +103,7 @@
36 previewListView.open = true;
37 scopes.get(0).hideDash();
38 tryCompare(previewListView, "open", false);
39+ tryCompare(openEffect, "gap", 0);
40 }
41
42 function openPreview() {
43@@ -194,6 +188,7 @@
44
45 function test_previewCycle() {
46 tryCompare(previewListView, "open", false);
47+ tryCompare(openEffect, "gap", 0);
48
49 openPreview();
50
51@@ -211,7 +206,7 @@
52 checkArrowPosition(0);
53
54 // flick to the next previews
55-
56+ tryCompare(previewListView, "count", 15);
57 for (var i = 1; i < previewListView.count; ++i) {
58
59 mouseFlick(previewListView, previewListView.width - units.gu(1),
60@@ -332,7 +327,7 @@
61 tryCompare(previewListView, "open", false);
62 }
63
64- function test_filter_expand_expand() {
65+ function test_filter_expand_expand_collapse() {
66 // wait for the item to be there
67 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader2") != undefined; }, true);
68
69@@ -368,11 +363,15 @@
70 tryCompare(category0, "filtered", false);
71 tryCompare(category2, "filtered", true);
72 tryCompare(category2FilterGrid, "filter", true);
73+ mouseClick(header0, header0.width / 2, header0.height / 2);
74+ tryCompare(category0, "filtered", true);
75+ tryCompare(category2, "filtered", true);
76 }
77
78 function test_narrow_delegate_ranges_expand() {
79 tryCompareFunction(function() { return findChild(genericScopeView, "dashCategory0") != undefined; }, true);
80 var category = findChild(genericScopeView, "dashCategory0")
81+ tryCompare(category, "filtered", true);
82
83 shell.width = units.gu(20)
84 var categoryListView = findChild(genericScopeView, "categoryListView");
85@@ -386,4 +385,12 @@
86 }
87 }
88 }
89+
90+ PreviewListView {
91+ id: previewListView
92+ anchors.fill: parent
93+ openEffect: openEffect
94+ categoryView: genericScopeView.categoryView
95+ scope: genericScopeView.scope
96+ }
97 }

Subscribers

People subscribed via source and target branches