Unity 8

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

  1. photoscopeimprovements
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Michał Sawicz
Approved revision: 1394
Merged at revision: 1461
Proposed branch: lp:~aacid/unity8/photoscopeimprovements
Merge into: lp:unity8
Prerequisite: lp:~aacid/unity8/croppedImageSizer
Diff against target: 411 lines (+47/-80)
23 files modified
debian/control (+0/-1)
plugins/Dash/CardCreator.js (+2/-5)
plugins/Dash/CroppedImageMinimumSourceSize.qml (+1/-1)
plugins/Dash/croppedimagesizer.cpp (+3/-0)
plugins/Dash/croppedimagesizer.h (+3/-3)
qml/Dash/CardCarousel.qml (+1/-0)
qml/Dash/CardGrid.qml (+1/-1)
qml/Dash/CardHorizontalList.qml (+1/-0)
qml/Dash/CardVerticalJournal.qml (+0/-1)
qml/Dash/DashRenderer.qml (+0/-4)
qml/Dash/GenericScopeView.qml (+22/-25)
qml/Dash/Previews/PreviewZoomableImage.qml (+1/-0)
qml/Dash/ScopesOverviewAll.qml (+0/-2)
tests/autopilot/unity8/shell/emulators/dash.py (+1/-1)
tests/plugins/Dash/cardcreator/1.res (+1/-2)
tests/plugins/Dash/cardcreator/2.res (+1/-2)
tests/plugins/Dash/cardcreator/3.res (+1/-2)
tests/plugins/Dash/cardcreator/4.res (+1/-2)
tests/plugins/Dash/cardcreator/5.res (+1/-2)
tests/plugins/Dash/cardcreator/7.res (+1/-2)
tests/qmltests/Dash/tst_Card.qml (+0/-22)
tests/qmltests/Dash/tst_Dash.qml (+4/-2)
tests/qmltests/Dash/tst_GenericScopeView.qml (+1/-0)
To merge this branch: bzr merge lp:~aacid/unity8/photoscopeimprovements
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Needs Fixing
Andrea Cimitan (community) code Approve
Review via email: mp+239834@code.launchpad.net

Commit message

Don't create the whole current scope delegates, just height * 3

Description of the change

* Are there any related MPs required for this MP to build/function as expected?
https://code.launchpad.net/~saviq/ubuntu-system-settings/add-connectivity-dep/+merge/243273 - needs to land together, or before

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

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

 * 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

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

FAILED: Continuous integration, rev:1371
http://jenkins.qa.ubuntu.com/job/unity8-ci/4766/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6251/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1752/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1862/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1860/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7503/console

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

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

FAILED: Continuous integration, rev:1372
http://jenkins.qa.ubuntu.com/job/unity8-ci/4769/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6254/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1755/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1865/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1863/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7506/console

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

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

FAILED: Continuous integration, rev:1373
http://jenkins.qa.ubuntu.com/job/unity8-ci/4773/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6259/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1759
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1869
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1867
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5873/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7511
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7511/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15140

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

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

FAILED: Continuous integration, rev:1375
http://jenkins.qa.ubuntu.com/job/unity8-ci/4788/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6303/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1774
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1884
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1882
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5912/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7555
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7555/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15207

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

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

FAILED: Continuous integration, rev:1378
http://jenkins.qa.ubuntu.com/job/unity8-ci/4791/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6315/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1777
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1887
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1885
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5921/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7567
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7567/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15219

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

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

FAILED: Continuous integration, rev:1378
http://jenkins.qa.ubuntu.com/job/unity8-ci/4792/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6324
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1778
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1888
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1886
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5931
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7576
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7576/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15231

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

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

FAILED: Continuous integration, rev:1379
http://jenkins.qa.ubuntu.com/job/unity8-ci/4805/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6371
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1791
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1901
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1899
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5975
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7623
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7623/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15286

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

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

FAILED: Continuous integration, rev:1380
http://jenkins.qa.ubuntu.com/job/unity8-ci/4813/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6399/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1799
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1909
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1907
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/6002/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7651
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7651/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15334

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) wrote :

could you add asynchronous true in previewzoomableimage? other than that, photo scope improves for me

Revision history for this message
Albert Astals Cid (aacid) wrote :

> could you add asynchronous true in previewzoomableimage? other than that,
> photo scope improves for me

Done

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

FAILED: Continuous integration, rev:1381
http://jenkins.qa.ubuntu.com/job/unity8-ci/4816/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6445/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1802/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1912/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1910/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7697/console

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

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

FAILED: Continuous integration, rev:1382
http://jenkins.qa.ubuntu.com/job/unity8-ci/4824/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6472/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1810/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1920/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1918/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7724/console

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

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

FAILED: Continuous integration, rev:1383
http://jenkins.qa.ubuntu.com/job/unity8-ci/4828/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/6485/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1814/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1924/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1922/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7737/console

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

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

FAILED: Continuous integration, rev:1384
http://jenkins.qa.ubuntu.com/job/unity8-ci/4837/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/23
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/2
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/23
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15503

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

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

FAILED: Continuous integration, rev:1385
http://jenkins.qa.ubuntu.com/job/unity8-ci/4844/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/44
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/9
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/9
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/45
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/44
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/44/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15542

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

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

FAILED: Continuous integration, rev:1387
http://jenkins.qa.ubuntu.com/job/unity8-ci/4850/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/51
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/15
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/51
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/51/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15555

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

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

FAILED: Continuous integration, rev:1388
http://jenkins.qa.ubuntu.com/job/unity8-ci/4855/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/60
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/32
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/20
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/63
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/60
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/60/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15571

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

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

FAILED: Continuous integration, rev:1389
http://jenkins.qa.ubuntu.com/job/unity8-ci/4864/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/41
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/29
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/76
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/79
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/79/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15614

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve (code)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1390
http://jenkins.qa.ubuntu.com/job/unity8-ci/4884/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/156/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/61
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/49
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/49
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/147/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/156
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/156/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15745

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

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

FAILED: Continuous integration, rev:1392
http://jenkins.qa.ubuntu.com/job/unity8-ci/4890/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/170
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/67
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/55
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/55
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/159
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/170
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/170/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15758

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

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

FAILED: Continuous integration, rev:1392
http://jenkins.qa.ubuntu.com/job/unity8-ci/4913/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/231
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/90/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/78
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/209
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/231
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/231/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15879

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) :
review: Approve (code)
Revision history for this message
Andrea Cimitan (cimi) wrote :

I tested and I had other issues (dash activity indicator staying on screen for several seconds, and news scope with results on top of each other), they are likely unrelated to this. Waiting another silo to test again on RTM

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

FAILED: Continuous integration, rev:1393
http://jenkins.qa.ubuntu.com/job/unity8-ci/4976/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/364
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/153/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/141
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/328
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/364
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/364/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16260

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

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

FAILED: Continuous integration, rev:1393
http://jenkins.qa.ubuntu.com/job/unity8-ci/4980/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/371
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/157
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/145
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/334
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/371
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/371/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16269

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

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

This introduced a failure in AP:
unity8.shell.tests.test_emulators.GenericScopeViewEmulatorTestCase.test_open_preview

review: Needs Fixing
lp:~aacid/unity8/photoscopeimprovements updated
1394. By Albert Astals Cid

Need a wait_ here now that things are more async

Revision history for this message
Albert Astals Cid (aacid) wrote :

> This introduced a failure in AP:
> unity8.shell.tests.test_emulators.GenericScopeViewEmulatorTestCase.test_open_p
> review

Fixed with the last commit, running the test is considerably slower with this branch than with trunk (105 seconds vs 85 seconds) but using https://code.launchpad.net/~aacid/unity8/moreAsyncDash it goes back to 85 seconds so i think it should not be a problem.

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

FAILED: Continuous integration, rev:1394
http://jenkins.qa.ubuntu.com/job/unity8-ci/4997/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/427
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/174
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/162
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/162
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/376
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/427
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/427/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/16361

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

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-11-17 10:09:40 +0000
3+++ debian/control 2014-12-01 15:53:18 +0000
4@@ -173,7 +173,6 @@
5 libhardware2,
6 unity-schemas (>= 7.3.1+14.10.20140915),
7 pay-service,
8- qml-module-ubuntu-connectivity,
9 ${misc:Depends},
10 ${shlibs:Depends},
11 Provides: unity-launcher-impl,
12
13=== modified file 'plugins/Dash/CardCreator.js'
14--- plugins/Dash/CardCreator.js 2014-12-01 15:53:18 +0000
15+++ plugins/Dash/CardCreator.js 2014-12-01 15:53:18 +0000
16@@ -85,8 +85,7 @@
17 CroppedImageMinimumSourceSize { \n\
18 id: artImage; \n\
19 objectName: "artImage"; \n\
20- property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
21- source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; } \n\
22+ source: cardData && cardData["art"] || ""; \n\
23 asynchronous: root.asynchronous; \n\
24 visible: false; \n\
25 width: %2; \n\
26@@ -196,8 +195,7 @@
27 id: mascotImage; \n\
28 objectName: "mascotImage"; \n\
29 anchors { %1 } \n\
30- property bool doLoadSource: !NetworkingStatus.limitedBandwith; \n\
31- source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; } \n\
32+ source: cardData && cardData["mascot"] || ""; \n\
33 width: units.gu(6); \n\
34 height: units.gu(5.625); \n\
35 horizontalAlignment: Image.AlignHCenter; \n\
36@@ -656,7 +654,6 @@
37 var imports = 'import QtQuick 2.2; \n\
38 import Ubuntu.Components 1.1; \n\
39 import Ubuntu.Settings.Components 0.1; \n\
40- import Ubuntu.Connectivity 1.0; \n\
41 import Dash 0.1;\n\
42 import Utils 0.1;\n';
43 var card = cardString(template, components);
44
45=== modified file 'plugins/Dash/CroppedImageMinimumSourceSize.qml'
46--- plugins/Dash/CroppedImageMinimumSourceSize.qml 2014-12-01 15:53:18 +0000
47+++ plugins/Dash/CroppedImageMinimumSourceSize.qml 2014-12-01 15:53:18 +0000
48@@ -39,6 +39,6 @@
49 anchors.fill: parent
50 fillMode: Image.PreserveAspectCrop
51 sourceSize: sizer.sourceSize.width == 0 && sizer.sourceSize.height == 0 ? undefined : sizer.sourceSize
52- source: sourceSize.width == -1 && sourceSize.height == -1 ? "" : root.source
53+ source: sizer.sourceSize.width == -1 && sizer.sourceSize.height == -1 ? "" : root.source
54 }
55 }
56
57=== modified file 'plugins/Dash/croppedimagesizer.cpp'
58--- plugins/Dash/croppedimagesizer.cpp 2014-12-01 15:53:18 +0000
59+++ plugins/Dash/croppedimagesizer.cpp 2014-12-01 15:53:18 +0000
60@@ -24,6 +24,9 @@
61 #include <QQuickView>
62
63 CroppedImageSizer::CroppedImageSizer()
64+ : m_width(0),
65+ m_height(0),
66+ m_sourceSize(QSize(-1, -1))
67 {
68 connect(this, &CroppedImageSizer::inputParamsChanged, this, &CroppedImageSizer::calculateSourceSize);
69 connect(this, &CroppedImageSizer::sourceChanged, this, &CroppedImageSizer::requestImage);
70
71=== modified file 'plugins/Dash/croppedimagesizer.h'
72--- plugins/Dash/croppedimagesizer.h 2014-12-01 15:53:18 +0000
73+++ plugins/Dash/croppedimagesizer.h 2014-12-01 15:53:18 +0000
74@@ -61,9 +61,9 @@
75
76 private:
77 QUrl m_source;
78- qreal m_width = 0;
79- qreal m_height = 0;
80- QSize m_sourceSize = QSize(-1, -1);
81+ qreal m_width;
82+ qreal m_height;
83+ QSize m_sourceSize;
84 QSize m_imageSize;
85 QNetworkReply *m_reply = nullptr;
86 };
87
88=== modified file 'qml/Dash/CardCarousel.qml'
89--- qml/Dash/CardCarousel.qml 2014-09-12 09:31:56 +0000
90+++ qml/Dash/CardCarousel.qml 2014-12-01 15:53:18 +0000
91@@ -52,6 +52,7 @@
92 function pressAndHold() { cardCarousel.pressAndHold(index, model.result, model) }
93
94 sourceComponent: cardTool.cardComponent
95+ asynchronous: true
96 onLoaded: {
97 item.fixedHeaderHeight = Qt.binding(function() { return carousel.headerHeight; });
98 item.height = Qt.binding(function() { return cardTool.cardHeight; });
99
100=== modified file 'qml/Dash/CardGrid.qml'
101--- qml/Dash/CardGrid.qml 2014-09-30 09:23:23 +0000
102+++ qml/Dash/CardGrid.qml 2014-12-01 15:53:18 +0000
103@@ -55,11 +55,11 @@
104 delegate: Item {
105 width: grid.cellWidth
106 height: grid.cellHeight
107- visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd
108 Loader {
109 id: loader
110 sourceComponent: cardTool.cardComponent
111 anchors.horizontalCenter: parent.horizontalCenter
112+ asynchronous: true
113 onLoaded: {
114 item.objectName = "delegate" + index;
115 item.width = Qt.binding(function() { return cardTool.cardWidth; });
116
117=== modified file 'qml/Dash/CardHorizontalList.qml'
118--- qml/Dash/CardHorizontalList.qml 2014-10-23 11:59:22 +0000
119+++ qml/Dash/CardHorizontalList.qml 2014-12-01 15:53:18 +0000
120@@ -42,6 +42,7 @@
121 sourceComponent: cardTool.cardComponent
122 anchors { top: parent.top; bottom: parent.bottom }
123 width: cardTool.cardWidth
124+ asynchronous: true
125 onLoaded: {
126 item.objectName = "delegate" + index;
127 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
128
129=== modified file 'qml/Dash/CardVerticalJournal.qml'
130--- qml/Dash/CardVerticalJournal.qml 2014-10-15 15:03:51 +0000
131+++ qml/Dash/CardVerticalJournal.qml 2014-12-01 15:53:18 +0000
132@@ -66,7 +66,6 @@
133 id: loader
134 sourceComponent: cardTool.cardComponent
135 width: cardTool.cardWidth
136- visible: y + height >= root.visibleRangeBegin && y <= root.visibleRangeEnd
137 onLoaded: {
138 item.objectName = "delegate" + index;
139 item.fixedArtShapeSize = Qt.binding(function() { return cardTool.artShapeSize; });
140
141=== modified file 'qml/Dash/DashRenderer.qml'
142--- qml/Dash/DashRenderer.qml 2014-10-02 09:53:26 +0000
143+++ qml/Dash/DashRenderer.qml 2014-12-01 15:53:18 +0000
144@@ -27,10 +27,6 @@
145
146 property int displayMarginEnd: 0
147
148- property int visibleRangeBegin: 0
149-
150- property int visibleRangeEnd: 0
151-
152 property real originY: 0
153
154 // The model to renderer
155
156=== modified file 'qml/Dash/GenericScopeView.qml'
157--- qml/Dash/GenericScopeView.qml 2014-11-04 12:52:02 +0000
158+++ qml/Dash/GenericScopeView.qml 2014-12-01 15:53:18 +0000
159@@ -379,32 +379,29 @@
160 }
161 }
162
163- if (item && item.hasOwnProperty("visibleRangeBegin")) {
164- item.visibleRangeBegin = Math.max(-baseItem.y, 0)
165- item.visibleRangeEnd = item.visibleRangeBegin + Math.min(categoryView.height, rendererLoader.height)
166- }
167-
168 if (item && item.hasOwnProperty("displayMarginBeginning")) {
169- // TODO do we need item.originY here, test 1300302 once we have a silo
170- // and we can run it on the phone
171- if (scopeView.isCurrent) {
172- // 1073741823 is s^30 -1. A quite big number so that you have "infinite" display margin, but not so
173- // big so that if you add if with itself you're outside the 2^31 int range
174- item.displayMarginBeginning = 1073741823;
175- item.displayMarginEnd = 1073741823;
176- } else if (baseItem.y + baseItem.height <= 0) {
177- // Not visible (item at top of the list viewport)
178- item.displayMarginBeginning = -baseItem.height;
179- item.displayMarginEnd = 0;
180- } else if (baseItem.y >= categoryView.height) {
181- // Not visible (item at bottom of the list viewport)
182- item.displayMarginBeginning = 0;
183- item.displayMarginEnd = -baseItem.height;
184- } else {
185- item.displayMarginBeginning = Math.round(-Math.max(-baseItem.y, 0));
186- item.displayMarginEnd = -Math.round(Math.max(baseItem.height - seeAll.height -
187- categoryView.height + baseItem.y, 0));
188- }
189+ // A item view is considered visible from
190+ // -displayMarginBeginning
191+ // to
192+ // height + item.displayMarginEnd
193+ // We adjust displayMarginBeginning and displayMarginEnd so
194+ // * In non visible scopes only the viewport is considered visible
195+ // that way when you switch to it the visible items are there
196+ // * For visible scopes we increase the visible range by categoryView.height * 1.5
197+ // in both directions to make scrolling nicer by mantaining a higher number of
198+ // cached items
199+ // TODO Improvements
200+ // - For non visible scopes we should always have a visible range of 0 and
201+ // make sure the items in the viewport are created with the cache buffer feature
202+ // - For visible scopes we should always the have a visible range be exactly the
203+ // viewport and make sure the rest of items are created with the cache buffer feature
204+ // To be able to implement that feature VerticalJournal/AbstractDashView needs to
205+ // make the cache buffer value setable externally
206+ var extraMargins = scopeView.isCurrent ? categoryView.height * 1.5 : 0;
207+
208+ item.displayMarginBeginning = Math.round(-Math.max(-baseItem.y - extraMargins, 0));
209+ item.displayMarginEnd = -Math.round(Math.max(baseItem.height - extraMargins - seeAll.height -
210+ categoryView.height + baseItem.y, 0));
211 }
212 }
213 }
214
215=== modified file 'qml/Dash/Previews/PreviewZoomableImage.qml'
216--- qml/Dash/Previews/PreviewZoomableImage.qml 2014-10-22 17:35:15 +0000
217+++ qml/Dash/Previews/PreviewZoomableImage.qml 2014-12-01 15:53:18 +0000
218@@ -40,6 +40,7 @@
219 }
220 scaleTo: "height"
221 source: widgetData["source"]
222+ asynchronous: true
223
224 borderSource: mouseArea.pressed ? "radius_pressed.sci" : "radius_idle.sci"
225
226
227=== modified file 'qml/Dash/ScopesOverviewAll.qml'
228--- qml/Dash/ScopesOverviewAll.qml 2014-10-23 11:59:22 +0000
229+++ qml/Dash/ScopesOverviewAll.qml 2014-12-01 15:53:18 +0000
230@@ -43,8 +43,6 @@
231 id: cardGrid
232 width: root.width
233 height: parent.height
234- visibleRangeBegin: root.contentY
235- visibleRangeEnd: root.contentY + root.height
236
237 onClicked: {
238 root.clicked(index, result, item, itemModel);
239
240=== renamed file 'qml/graphics/applicationIcons/dash@18.png' => 'qml/graphics/applicationIcons/dash.png'
241=== modified file 'tests/autopilot/unity8/shell/emulators/dash.py'
242--- tests/autopilot/unity8/shell/emulators/dash.py 2014-10-30 14:38:28 +0000
243+++ tests/autopilot/unity8/shell/emulators/dash.py 2014-12-01 15:53:18 +0000
244@@ -204,7 +204,7 @@
245
246 """
247 category_element = self._get_category_element(category)
248- icon = category_element.select_single('AbstractButton', title=title)
249+ icon = category_element.wait_select_single('AbstractButton', title=title)
250 self.pointing_device.click_object(icon)
251
252 def _get_category_element(self, category):
253
254=== modified file 'tests/plugins/Dash/cardcreator/1.res'
255--- tests/plugins/Dash/cardcreator/1.res 2014-12-01 15:53:18 +0000
256+++ tests/plugins/Dash/cardcreator/1.res 2014-12-01 15:53:18 +0000
257@@ -49,8 +49,7 @@
258 CroppedImageMinimumSourceSize {
259 id: artImage;
260 objectName: "artImage";
261- property bool doLoadSource: !NetworkingStatus.limitedBandwith;
262- source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
263+ source: cardData && cardData["art"] || "";
264 asynchronous: root.asynchronous;
265 visible: false;
266 width: root.width;
267
268=== modified file 'tests/plugins/Dash/cardcreator/2.res'
269--- tests/plugins/Dash/cardcreator/2.res 2014-12-01 15:53:18 +0000
270+++ tests/plugins/Dash/cardcreator/2.res 2014-12-01 15:53:18 +0000
271@@ -68,8 +68,7 @@
272 id: mascotImage;
273 objectName: "mascotImage";
274 anchors { verticalCenter: parent.verticalCenter; }
275- property bool doLoadSource: !NetworkingStatus.limitedBandwith;
276- source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
277+ source: cardData && cardData["mascot"] || "";
278 width: units.gu(6);
279 height: units.gu(5.625);
280 horizontalAlignment: Image.AlignHCenter;
281
282=== modified file 'tests/plugins/Dash/cardcreator/3.res'
283--- tests/plugins/Dash/cardcreator/3.res 2014-12-01 15:53:18 +0000
284+++ tests/plugins/Dash/cardcreator/3.res 2014-12-01 15:53:18 +0000
285@@ -49,8 +49,7 @@
286 CroppedImageMinimumSourceSize {
287 id: artImage;
288 objectName: "artImage";
289- property bool doLoadSource: !NetworkingStatus.limitedBandwith;
290- source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
291+ source: cardData && cardData["art"] || "";
292 asynchronous: root.asynchronous;
293 visible: false;
294 width: root.width;
295
296=== modified file 'tests/plugins/Dash/cardcreator/4.res'
297--- tests/plugins/Dash/cardcreator/4.res 2014-12-01 15:53:18 +0000
298+++ tests/plugins/Dash/cardcreator/4.res 2014-12-01 15:53:18 +0000
299@@ -47,8 +47,7 @@
300 id: mascotImage;
301 objectName: "mascotImage";
302 anchors { verticalCenter: parent.verticalCenter; }
303- property bool doLoadSource: !NetworkingStatus.limitedBandwith;
304- source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
305+ source: cardData && cardData["mascot"] || "";
306 width: units.gu(6);
307 height: units.gu(5.625);
308 horizontalAlignment: Image.AlignHCenter;
309
310=== modified file 'tests/plugins/Dash/cardcreator/5.res'
311--- tests/plugins/Dash/cardcreator/5.res 2014-12-01 15:53:18 +0000
312+++ tests/plugins/Dash/cardcreator/5.res 2014-12-01 15:53:18 +0000
313@@ -49,8 +49,7 @@
314 CroppedImageMinimumSourceSize {
315 id: artImage;
316 objectName: "artImage";
317- property bool doLoadSource: !NetworkingStatus.limitedBandwith;
318- source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["art"] || ""; }
319+ source: cardData && cardData["art"] || "";
320 asynchronous: root.asynchronous;
321 visible: false;
322 width: root.width;
323
324=== modified file 'tests/plugins/Dash/cardcreator/7.res'
325--- tests/plugins/Dash/cardcreator/7.res 2014-12-01 15:53:18 +0000
326+++ tests/plugins/Dash/cardcreator/7.res 2014-12-01 15:53:18 +0000
327@@ -68,8 +68,7 @@
328 id: mascotImage;
329 objectName: "mascotImage";
330 anchors { verticalCenter: parent.verticalCenter; }
331- property bool doLoadSource: !NetworkingStatus.limitedBandwith;
332- source: { if (root.visible) doLoadSource = true; return doLoadSource && cardData && cardData["mascot"] || ""; }
333+ source: cardData && cardData["mascot"] || "";
334 width: units.gu(6);
335 height: units.gu(5.625);
336 horizontalAlignment: Image.AlignHCenter;
337
338=== modified file 'tests/qmltests/Dash/tst_Card.qml'
339--- tests/qmltests/Dash/tst_Card.qml 2014-10-14 15:44:00 +0000
340+++ tests/qmltests/Dash/tst_Card.qml 2014-12-01 15:53:18 +0000
341@@ -17,7 +17,6 @@
342 import QtQuick 2.0
343 import QtTest 1.0
344 import Ubuntu.Components 0.1
345-import Ubuntu.Connectivity 1.0
346 import Unity.Test 0.1 as UT
347 import "../../../qml/Dash"
348 import "CardHelpers.js" as Helpers
349@@ -221,7 +220,6 @@
350
351 function init() {
352 loader.visible = true;
353- NetworkingStatus.limitedBandwith = false;
354 }
355
356 function cleanup() {
357@@ -585,25 +583,5 @@
358 verify((card.width - titleToCard.x - titleToCard.width) === units.gu(1));
359 }
360 }
361-
362- function test_load_images_visibility_network_data() {
363- return [
364- { tag: "Visible, network", visible: true, limitedBandwith: false },
365- { tag: "Visible, no network", visible: true, limitedBandwith: true },
366- { tag: "Not Visible, network", visible: false, limitedBandwith: false },
367- { tag: "Not Visible, no network", visible: false, limitedBandwith: true }
368- ];
369- }
370-
371- function test_load_images_visibility_network(data) {
372- loader.visible = data.visible;
373- NetworkingStatus.limitedBandwith = data.limitedBandwith;
374-
375- selector.selectedIndex = 0;
376- waitForRendering(selector);
377- waitForRendering(card);
378-
379- verify(data.visible || !data.limitedBandwith || artImage.source == "");
380- }
381 }
382 }
383
384=== modified file 'tests/qmltests/Dash/tst_Dash.qml'
385--- tests/qmltests/Dash/tst_Dash.qml 2014-10-30 14:55:29 +0000
386+++ tests/qmltests/Dash/tst_Dash.qml 2014-12-01 15:53:18 +0000
387@@ -243,8 +243,10 @@
388 tryCompare(scopesOverviewRepeater, "count", 0);
389
390 // Click on a temp scope in the search
391- var dashCategorysearchA = findChild(searchResultsViewer, "dashCategorysearchA");
392- var cardTempScope = findChild(dashCategorysearchA, "delegate2");
393+ tryCompareFunction( function() {
394+ return findChild(findChild(searchResultsViewer, "dashCategorysearchA"), "delegate2") != null;
395+ }, true);
396+ var cardTempScope = findChild(findChild(searchResultsViewer, "dashCategorysearchA"), "delegate2");
397 verify(cardTempScope, "Could not find delegate2");
398
399 waitForRendering(cardTempScope);
400
401=== modified file 'tests/qmltests/Dash/tst_GenericScopeView.qml'
402--- tests/qmltests/Dash/tst_GenericScopeView.qml 2014-11-24 11:28:41 +0000
403+++ tests/qmltests/Dash/tst_GenericScopeView.qml 2014-12-01 15:53:18 +0000
404@@ -293,6 +293,7 @@
405 },
406 true);
407 var tile = findChild(findChild(genericScopeView, "dashCategory"+category), "delegate"+delegate);
408+ waitForRendering(tile);
409 mouseClick(tile, tile.width / 2, tile.height / 2);
410 tryCompare(testCase.subPageLoader, "open", true);
411 tryCompare(testCase.subPageLoader, "x", 0);

Subscribers

People subscribed via source and target branches