Unity 8

Merge lp:~cimi/unity8/more_stable_lazy_image_test into lp:unity8

more_stable_lazy_image_test
Merge into trunk

Proposed by Andrea Cimitan on 2016-02-02

Status:	Merged
Approved by:	Albert Astals Cid on 2016-02-02
Approved revision:	2174
Merged at revision:	2173
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:	Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot	continuous-integration	2016-02-02	Needs Fixing on 2016-02-02
Unity8 CI Bot	continuous-integration	2016-02-02	Needs Fixing on 2016-02-02
Albert Astals Cid (community)		2016-02-02	Approve on 2016-02-02
Review via email: mp+284708@code.launchpad.net

This proposal supersedes a proposal from 2016-02-01.

Commit Message

Make LazyImage qmltest less flaky on CI

Description of the Change

Trying to make LazyImage tests stable on CI, reusing some old ideas of mine and aacid

* Are there any related MPs required for this MP to build/function as expected? Please list.
no
* Did you perform an exploratory manual test run of your code change and any related functionality?
y
* Did you make sure that your branch does not contain spurious tags?
y
* 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

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-01: Posted in a previous version of this proposal

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://code.launchpad.net/~cimi/unity8/more_stable_lazy_image_test/+merge/284596/+edit-commit-message

https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/232/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/232/rebuild

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-02-01: Posted in a previous version of this proposal

Nope:

FAIL! : qmltestrunner::LazyImage::test_lazyimage(Unbound Wide) property running
   Actual (): false
   Expected (): true
   Loc: [/home/tsdgeos_work/phablet/unity8/unity8-ubuntu-xenial-landing-019/tests/qmltests/Components/tst_LazyImage.qml(180)]

PS Jenkins bot (ps-jenkins) wrote on 2016-02-01: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-01: Posted in a previous version of this proposal

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://code.launchpad.net/~cimi/unity8/more_stable_lazy_image_test/+merge/284596/+edit-commit-message

https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/236/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/236/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-01: Posted in a previous version of this proposal

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

review: Needs Fixing (continuous-integration)

Albert Astals Cid (aacid) wrote on 2016-02-02:

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

* Did CI run pass?
Passes here, but let's wait one more time before top approving

* Did you make sure that the branch does not contain spurious tags?
Yes

review: Approve

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-02:

FAILED: Continuous integration, rev:2174
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/248/
Executed test runs:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/248/rebuild

review: Needs Fixing (continuous-integration)

PS Jenkins bot (ps-jenkins) wrote on 2016-02-02:

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Andrea Cimitan

Mohammad Rakibul Hasan

Unity Team

 === modified file 'tests/qmltests/Components/tst_LazyImage.qml'
 --- tests/qmltests/Components/tst_LazyImage.qml	2016-01-28 17:45:51 +0000
 +++ tests/qmltests/Components/tst_LazyImage.qml	2016-02-02 10:23:40 +0000
@@ -112,6 +112,11 @@
+         }
+     }
++    SignalSpy {
++        id: signalSpy
++        signalName: "runningChanged"
++    }
++
      UT.UnityTestCase {
          name: "LazyImage"
          when: windowShown
@@ -123,6 +128,18 @@
              tryCompare(lazy2, "height", units.gu(10));
              controls3.blank();
              tryCompare(lazy3, "width", units.gu(10));
++
++            tryCompare(lazy1, "state", "default");
++            var transition = findChildIn(lazy1, "transitions", "genericTransition");
++            tryCompare(transition, "running", false);
++
++            tryCompare(lazy2, "state", "default");
++            transition = findChildIn(lazy2, "transitions", "genericTransition");
++            tryCompare(transition, "running", false);
++
++            tryCompare(lazy3, "state", "default");
++            transition = findChildIn(lazy3, "transitions", "genericTransition");
++            tryCompare(transition, "running", false);
+         }
          function test_lazyimage_data() {
@@ -131,33 +148,34 @@
                  {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)},
                  {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)},
                  {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)},
--                {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},
++                {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},
                  {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},
                  {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)},
                  {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)},
                  {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)},
--                {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},
++                {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},
                  {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},
                  {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)},
                  {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)},
                  {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)},
--                {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},
++                {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},
                  {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},
                  {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)},
                  {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)},
                  {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)},
--                {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},
++                {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},
+             ]
+         }
          function test_lazyimage(data) {
++            var transition = findChildIn(data.image, "transitions", data.transition);
++            signalSpy.target = transition;
++            signalSpy.clear();
++
              data.func();
              if (data.transition) {
--                waitForRendering(data.image);
--                // wait for the transition to complete
--                var transition = findChildIn(data.image, "transitions", data.transition);
--                tryCompare(transition, "running", true);
++                tryCompare(data.image, "state", data.state ? data.state : "ready");
                  tryCompare(transition, "running", false);
+             }
@@ -186,7 +204,7 @@
              // check the error image
              var error = findChild(data.image, "errorImage");
--            compare(error.visible, data.error ? true : false);
++            tryCompare(error, "visible", data.error ? true : false);
+         }
+     }
+ }