Merge lp:~cimi/unity8/more_stable_lazy_image_test into lp:unity8
- more_stable_lazy_image_test
- Merge into trunk
Status: | Superseded |
---|---|
Proposed branch: | lp:~cimi/unity8/more_stable_lazy_image_test |
Merge into: | lp:unity8 |
Diff against target: |
86 lines (+27/-9) 1 file modified
tests/qmltests/Components/tst_LazyImage.qml (+27/-9) |
To merge this branch: | bzr merge lp:~cimi/unity8/more_stable_lazy_image_test |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Unity8 CI Bot | continuous-integration | Needs Fixing | |
Unity Team | Pending | ||
Review via email: mp+284596@code.launchpad.net |
This proposal supersedes a proposal from 2016-02-01.
This proposal has been superseded by a proposal from 2016-02-02.
Commit message
Description of the change
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
Albert Astals Cid (aacid) wrote : | # |
Nope:
FAIL! : qmltestrunner:
Actual (): false
Expected (): true
Loc: [/home/
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:2172
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 2173. By Andrea Cimitan
-
Yet another attempt
Unity8 CI Bot (unity8-ci-bot) wrote : | # |
FAILED: Continuous integration, rev:2173
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
https:/
Executed test runs:
Click here to trigger a rebuild:
https:/
PS Jenkins bot (ps-jenkins) wrote : | # |
FAILED: Continuous integration, rev:2173
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
FAILURE: http://
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
- 2174. By Andrea Cimitan
-
merged el trunko
Unmerged revisions
Preview Diff
1 | === modified file 'tests/qmltests/Components/tst_LazyImage.qml' | |||
2 | --- tests/qmltests/Components/tst_LazyImage.qml 2016-01-28 17:45:51 +0000 | |||
3 | +++ tests/qmltests/Components/tst_LazyImage.qml 2016-02-02 10:22:27 +0000 | |||
4 | @@ -112,6 +112,11 @@ | |||
5 | 112 | } | 112 | } |
6 | 113 | } | 113 | } |
7 | 114 | 114 | ||
8 | 115 | SignalSpy { | ||
9 | 116 | id: signalSpy | ||
10 | 117 | signalName: "runningChanged" | ||
11 | 118 | } | ||
12 | 119 | |||
13 | 115 | UT.UnityTestCase { | 120 | UT.UnityTestCase { |
14 | 116 | name: "LazyImage" | 121 | name: "LazyImage" |
15 | 117 | when: windowShown | 122 | when: windowShown |
16 | @@ -123,6 +128,18 @@ | |||
17 | 123 | tryCompare(lazy2, "height", units.gu(10)); | 128 | tryCompare(lazy2, "height", units.gu(10)); |
18 | 124 | controls3.blank(); | 129 | controls3.blank(); |
19 | 125 | tryCompare(lazy3, "width", units.gu(10)); | 130 | tryCompare(lazy3, "width", units.gu(10)); |
20 | 131 | |||
21 | 132 | tryCompare(lazy1, "state", "default"); | ||
22 | 133 | var transition = findChildIn(lazy1, "transitions", "genericTransition"); | ||
23 | 134 | tryCompare(transition, "running", false); | ||
24 | 135 | |||
25 | 136 | tryCompare(lazy2, "state", "default"); | ||
26 | 137 | transition = findChildIn(lazy2, "transitions", "genericTransition"); | ||
27 | 138 | tryCompare(transition, "running", false); | ||
28 | 139 | |||
29 | 140 | tryCompare(lazy3, "state", "default"); | ||
30 | 141 | transition = findChildIn(lazy3, "transitions", "genericTransition"); | ||
31 | 142 | tryCompare(transition, "running", false); | ||
32 | 126 | } | 143 | } |
33 | 127 | 144 | ||
34 | 128 | function test_lazyimage_data() { | 145 | function test_lazyimage_data() { |
35 | @@ -131,33 +148,34 @@ | |||
36 | 131 | {tag: "Unbound Wide", image: lazy1, func: controls1.wide, transition: "readyTransition", width: 160, height: 80, imageWidth: 160, imageHeight: 80, initialWidth: units.gu(10), initialHeight: units.gu(10)}, | 148 | {tag: "Unbound Wide", image: lazy1, func: controls1.wide, transition: "readyTransition", width: 160, height: 80, imageWidth: 160, imageHeight: 80, initialWidth: units.gu(10), initialHeight: units.gu(10)}, |
37 | 132 | {tag: "Unbound Square", image: lazy1, func: controls1.square, transition: "readyTransition", width: 160, height: 160, imageWidth: 160, imageHeight: 160, initialWidth: units.gu(10), initialHeight: units.gu(10)}, | 149 | {tag: "Unbound Square", image: lazy1, func: controls1.square, transition: "readyTransition", width: 160, height: 160, imageWidth: 160, imageHeight: 160, initialWidth: units.gu(10), initialHeight: units.gu(10)}, |
38 | 133 | {tag: "Unbound Portrait", image: lazy1, func: controls1.portrait, transition: "readyTransition", width: 80, height: 160, imageWidth: 80, imageHeight: 160, initialWidth: units.gu(10), initialHeight: units.gu(10)}, | 150 | {tag: "Unbound Portrait", image: lazy1, func: controls1.portrait, transition: "readyTransition", width: 80, height: 160, imageWidth: 80, imageHeight: 160, initialWidth: units.gu(10), initialHeight: units.gu(10)}, |
40 | 134 | {tag: "Unbound Bad path", image: lazy1, func: controls1.badpath, transition: "genericTransition", width: units.gu(10), height: units.gu(10), imageWidth: units.gu(10), imageHeight: units.gu(10), initialWidth: units.gu(10), initialHeight: units.gu(10), placeholder: true, error: true}, | 151 | {tag: "Unbound Bad path", image: lazy1, func: controls1.badpath, transition: "genericTransition", state: "error", width: units.gu(10), height: units.gu(10), imageWidth: units.gu(10), imageHeight: units.gu(10), initialWidth: units.gu(10), initialHeight: units.gu(10), placeholder: true, error: true}, |
41 | 135 | {tag: "Width-bound Blank", image: lazy2, func: controls2.blank, width: units.gu(30), height: units.gu(10), imageWidth: units.gu(30), imageHeight: units.gu(10), initialWidth: units.gu(30), initialHeight: units.gu(10), placeholder: true}, | 152 | {tag: "Width-bound Blank", image: lazy2, func: controls2.blank, width: units.gu(30), height: units.gu(10), imageWidth: units.gu(30), imageHeight: units.gu(10), initialWidth: units.gu(30), initialHeight: units.gu(10), placeholder: true}, |
42 | 136 | {tag: "Width-bound Wide", image: lazy2, func: controls2.wide, transition: "readyTransition", width: units.gu(30), height: units.gu(15), imageWidth: units.gu(30), imageHeight: units.gu(15), initialWidth: units.gu(30), initialHeight: units.gu(10)}, | 153 | {tag: "Width-bound Wide", image: lazy2, func: controls2.wide, transition: "readyTransition", width: units.gu(30), height: units.gu(15), imageWidth: units.gu(30), imageHeight: units.gu(15), initialWidth: units.gu(30), initialHeight: units.gu(10)}, |
43 | 137 | {tag: "Width-bound Square", image: lazy2, func: controls2.square, transition: "readyTransition", width: units.gu(30), height: units.gu(30), imageWidth: units.gu(30), imageHeight: units.gu(30), initialWidth: units.gu(30), initialHeight: units.gu(10)}, | 154 | {tag: "Width-bound Square", image: lazy2, func: controls2.square, transition: "readyTransition", width: units.gu(30), height: units.gu(30), imageWidth: units.gu(30), imageHeight: units.gu(30), initialWidth: units.gu(30), initialHeight: units.gu(10)}, |
44 | 138 | {tag: "Width-bound Portrait", image: lazy2, func: controls2.portrait, transition: "readyTransition", width: units.gu(30), height: units.gu(60), imageWidth: units.gu(30), imageHeight: units.gu(60), initialWidth: units.gu(30), initialHeight: units.gu(10)}, | 155 | {tag: "Width-bound Portrait", image: lazy2, func: controls2.portrait, transition: "readyTransition", width: units.gu(30), height: units.gu(60), imageWidth: units.gu(30), imageHeight: units.gu(60), initialWidth: units.gu(30), initialHeight: units.gu(10)}, |
46 | 139 | {tag: "Width-bound Bad path", image: lazy2, func: controls2.badpath, transition: "genericTransition", width: units.gu(30), height: units.gu(10), imageWidth: units.gu(30), imageHeight: units.gu(10), initialWidth: units.gu(30), initialHeight: units.gu(10), placeholder: true, error: true}, | 156 | {tag: "Width-bound Bad path", image: lazy2, func: controls2.badpath, transition: "genericTransition", state: "error", width: units.gu(30), height: units.gu(10), imageWidth: units.gu(30), imageHeight: units.gu(10), initialWidth: units.gu(30), initialHeight: units.gu(10), placeholder: true, error: true}, |
47 | 140 | {tag: "Height-bound Blank", image: lazy3, func: controls3.blank, width: units.gu(10), height: units.gu(12), imageWidth: units.gu(10), imageHeight: units.gu(12), initialWidth: units.gu(10), initialHeight: units.gu(12), placeholder: true}, | 157 | {tag: "Height-bound Blank", image: lazy3, func: controls3.blank, width: units.gu(10), height: units.gu(12), imageWidth: units.gu(10), imageHeight: units.gu(12), initialWidth: units.gu(10), initialHeight: units.gu(12), placeholder: true}, |
48 | 141 | {tag: "Height-bound Wide", image: lazy3, func: controls3.wide, transition: "readyTransition", width: units.gu(24), height: units.gu(12), imageWidth: units.gu(24), imageHeight: units.gu(12), initialWidth: units.gu(10), initialHeight: units.gu(12)}, | 158 | {tag: "Height-bound Wide", image: lazy3, func: controls3.wide, transition: "readyTransition", width: units.gu(24), height: units.gu(12), imageWidth: units.gu(24), imageHeight: units.gu(12), initialWidth: units.gu(10), initialHeight: units.gu(12)}, |
49 | 142 | {tag: "Height-bound Square", image: lazy3, func: controls3.square, transition: "readyTransition", width: units.gu(12), height: units.gu(12), imageWidth: units.gu(12), imageHeight: units.gu(12), initialWidth: units.gu(10), initialHeight: units.gu(12)}, | 159 | {tag: "Height-bound Square", image: lazy3, func: controls3.square, transition: "readyTransition", width: units.gu(12), height: units.gu(12), imageWidth: units.gu(12), imageHeight: units.gu(12), initialWidth: units.gu(10), initialHeight: units.gu(12)}, |
50 | 143 | {tag: "Height-bound Portrait", image: lazy3, func: controls3.portrait, transition: "readyTransition", width: units.gu(6), height: units.gu(12), imageWidth: units.gu(6), imageHeight: units.gu(12), initialWidth: units.gu(10), initialHeight: units.gu(12)}, | 160 | {tag: "Height-bound Portrait", image: lazy3, func: controls3.portrait, transition: "readyTransition", width: units.gu(6), height: units.gu(12), imageWidth: units.gu(6), imageHeight: units.gu(12), initialWidth: units.gu(10), initialHeight: units.gu(12)}, |
52 | 144 | {tag: "Height-bound Bad path", image: lazy3, func: controls3.badpath, transition: "genericTransition", width: units.gu(10), height: units.gu(12), imageWidth: units.gu(10), imageHeight: units.gu(12), initialWidth: units.gu(10), initialHeight: units.gu(12), placeholder: true, error: true}, | 161 | {tag: "Height-bound Bad path", image: lazy3, func: controls3.badpath, transition: "genericTransition", state: "error", width: units.gu(10), height: units.gu(12), imageWidth: units.gu(10), imageHeight: units.gu(12), initialWidth: units.gu(10), initialHeight: units.gu(12), placeholder: true, error: true}, |
53 | 145 | {tag: "Fit Blank", image: lazy4, func: controls4.blank, width: units.gu(12), height: units.gu(12), imageWidth: units.gu(12), imageHeight: units.gu(12), initialWidth: units.gu(12), initialHeight: units.gu(12), placeholder: true}, | 162 | {tag: "Fit Blank", image: lazy4, func: controls4.blank, width: units.gu(12), height: units.gu(12), imageWidth: units.gu(12), imageHeight: units.gu(12), initialWidth: units.gu(12), initialHeight: units.gu(12), placeholder: true}, |
54 | 146 | {tag: "Fit Wide", image: lazy4, func: controls4.wide, transition: "readyTransition", width: units.gu(12), height: units.gu(12), imageWidth: units.gu(12), imageHeight: units.gu(6), initialWidth: units.gu(12), initialHeight: units.gu(12)}, | 163 | {tag: "Fit Wide", image: lazy4, func: controls4.wide, transition: "readyTransition", width: units.gu(12), height: units.gu(12), imageWidth: units.gu(12), imageHeight: units.gu(6), initialWidth: units.gu(12), initialHeight: units.gu(12)}, |
55 | 147 | {tag: "Fit Square", image: lazy4, func: controls4.square, transition: "readyTransition", width: units.gu(12), height: units.gu(12), imageWidth: units.gu(12), imageHeight: units.gu(12), initialWidth: units.gu(12), initialHeight: units.gu(12)}, | 164 | {tag: "Fit Square", image: lazy4, func: controls4.square, transition: "readyTransition", width: units.gu(12), height: units.gu(12), imageWidth: units.gu(12), imageHeight: units.gu(12), initialWidth: units.gu(12), initialHeight: units.gu(12)}, |
56 | 148 | {tag: "Fit Portrait", image: lazy4, func: controls4.portrait, transition: "readyTransition", width: units.gu(12), height: units.gu(12), imageWidth: units.gu(6), imageHeight: units.gu(12), initialWidth: units.gu(12), initialHeight: units.gu(12)}, | 165 | {tag: "Fit Portrait", image: lazy4, func: controls4.portrait, transition: "readyTransition", width: units.gu(12), height: units.gu(12), imageWidth: units.gu(6), imageHeight: units.gu(12), initialWidth: units.gu(12), initialHeight: units.gu(12)}, |
58 | 149 | {tag: "Fit Bad path", image: lazy4, func: controls4.badpath, transition: "genericTransition", width: units.gu(12), height: units.gu(12), imageWidth: units.gu(12), imageHeight: units.gu(12), initialWidth: units.gu(12), initialHeight: units.gu(12), placeholder: true, error: true}, | 166 | {tag: "Fit Bad path", image: lazy4, func: controls4.badpath, transition: "genericTransition", state: "error", width: units.gu(12), height: units.gu(12), imageWidth: units.gu(12), imageHeight: units.gu(12), initialWidth: units.gu(12), initialHeight: units.gu(12), placeholder: true, error: true}, |
59 | 150 | ] | 167 | ] |
60 | 151 | } | 168 | } |
61 | 152 | 169 | ||
62 | 153 | function test_lazyimage(data) { | 170 | function test_lazyimage(data) { |
63 | 171 | var transition = findChildIn(data.image, "transitions", data.transition); | ||
64 | 172 | signalSpy.target = transition; | ||
65 | 173 | signalSpy.clear(); | ||
66 | 174 | |||
67 | 154 | data.func(); | 175 | data.func(); |
68 | 155 | 176 | ||
69 | 156 | if (data.transition) { | 177 | if (data.transition) { |
74 | 157 | waitForRendering(data.image); | 178 | tryCompare(data.image, "state", data.state ? data.state : "ready"); |
71 | 158 | // wait for the transition to complete | ||
72 | 159 | var transition = findChildIn(data.image, "transitions", data.transition); | ||
73 | 160 | tryCompare(transition, "running", true); | ||
75 | 161 | tryCompare(transition, "running", false); | 179 | tryCompare(transition, "running", false); |
76 | 162 | } | 180 | } |
77 | 163 | 181 | ||
78 | @@ -186,7 +204,7 @@ | |||
79 | 186 | 204 | ||
80 | 187 | // check the error image | 205 | // check the error image |
81 | 188 | var error = findChild(data.image, "errorImage"); | 206 | var error = findChild(data.image, "errorImage"); |
83 | 189 | compare(error.visible, data.error ? true : false); | 207 | tryCompare(error, "visible", data.error ? true : false); |
84 | 190 | } | 208 | } |
85 | 191 | } | 209 | } |
86 | 192 | } | 210 | } |
FAILED: Continuous integration, rev:2172 /code.launchpad .net/~cimi/ unity8/ more_stable_ lazy_image_ test/+merge/ 284596/ +edit-commit- message
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https:/
https:/ /unity8- jenkins. ubuntu. com/job/ lp-unity8- 1-ci/232/
Executed test runs:
Click here to trigger a rebuild: /unity8- jenkins. ubuntu. com/job/ lp-unity8- 1-ci/232/ rebuild
https:/