Merge lp:~lukas-kde/unity8/unsnap-from-panel into lp:unity8

Proposed by Lukáš Tinkl
Status: Merged
Approved by: Michał Sawicz
Approved revision: 2851
Merged at revision: 2877
Proposed branch: lp:~lukas-kde/unity8/unsnap-from-panel
Merge into: lp:unity8
Prerequisite: lp:~lukas-kde/unity8/fix-window-buttons-touch
Diff against target: 194 lines (+104/-11)
3 files modified
qml/ApplicationMenus/MenuBar.qml (+5/-0)
qml/Panel/Panel.qml (+8/-2)
tests/qmltests/tst_Shell.qml (+91/-9)
To merge this branch: bzr merge lp:~lukas-kde/unity8/unsnap-from-panel
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Approve
Michał Sawicz Approve
Albert Astals Cid (community) Approve
Review via email: mp+319558@code.launchpad.net

Commit message

Fix unsnapping a maximized window from the panel

Description of the change

Fix unsnapping a maximized window from the panel

Load the menubar only if the call hint isn't active

* Are there any related MPs required for this MP to build/function as expected? Please list.

Yes, prereq

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

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
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2842
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3337/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4391
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2628
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2628
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4419
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4252
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4252/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4252
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4252/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4252
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4252/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4252
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4252/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4252
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4252/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4252
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4252/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2843
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3338/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4392
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2629
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2629
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4420
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4253
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4253/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4253
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4253/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4253
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4253/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4253
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4253/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4253
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4253/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4253
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4253/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2844
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3339/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4393
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2630
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2630
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4421
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4254
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4254/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4254
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4254/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4254
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4254/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4254
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4254/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4254
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4254/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4254
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4254/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Two minor things in the tests:

+ mouseMove(panel, panel.width/2, panel.panelHeight/2, 200 /* delay */); // to reveal the menus

Maybe we can add a try compare here to actaully check the menu is shown here?

+ // start dialer, maximize it

You're not starting the dialer, s/dialer/app ?

review: Needs Fixing
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

> Two minor things in the tests:
>
> + mouseMove(panel, panel.width/2, panel.panelHeight/2, 200 /* delay */); // to
> reveal the menus
> Maybe we can add a try compare here to actaully check the menu is shown here?

Done, removed the delay

> + // start dialer, maximize it
>
> You're not starting the dialer, s/dialer/app ?

Yup fixed. Originally it was dialer but then I realized dialer-app has some special treatment in shell, such as it wouldn't show the call hint in the panel.

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

I can't open the menus anymore on maximized windows

review: Needs Fixing
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2845
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3340/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4394
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2631
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2631
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4422
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4255
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4255/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4255
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4255/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4255
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4255/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4255
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4255/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4255
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4255/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4255
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4255/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2846
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3341/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4396
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2632
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2632
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4424
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4257
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4257/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4257
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4257/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4257
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4257/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4257
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4257/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4257
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4257/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4257
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4257/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

> I can't open the menus anymore on maximized windows

Fixed \o/

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2848
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3357/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4423
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2651
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2651
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4451
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4284
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4284/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4284
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4284/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4284
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4284/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4284
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4284/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4284
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4284/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4284
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4284/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Can you add a test for the thing that broke and you just fixed (i.e. showing menus while maximized)

review: Needs Fixing
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

> Can you add a test for the thing that broke and you just fixed (i.e. showing
> menus while maximized)

Test added

Revision history for this message
Albert Astals Cid (aacid) wrote :
review: Needs Fixing
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2849
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3370/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4442
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2659
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2659
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4470
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4300
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4300/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4300
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4300/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4300
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4300/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4300
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4300/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4300
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4300/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4300
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4300/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

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

 * Did CI run pass? If not, please explain why.
Let's wait before top approving

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2850
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3373/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4446
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2663
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2663
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4474
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4304
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4304/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4304
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4304/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4304
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4304/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4304
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4304/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4304
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4304/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4304
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4304/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2850
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3375/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4449
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2666
    UNSTABLE: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2666
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4477
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4307
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4307/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4307
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4307/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4307
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4307/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4307
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4307/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4307
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4307/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4307
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4307/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

The newly added test failed on CI :/

review: Needs Fixing
Revision history for this message
Lukáš Tinkl (lukas-kde) wrote :

It's not the new one, just flaky run imo, will restart CI

Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2850
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3388/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4466
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2681
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2681
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4494
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4321/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4321
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4321/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Ok

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

The touch version of test_dragPanelToRestoreMaximizedWindow fails for me here 100% after having installled silo 2555 and lp:~ci-train-bot/unity8/unity8-ubuntu-zesty-2555:

$ sh ./builddir/tests/scripts/testShell.sh Shell::test_dragPanelToRestoreMaximizedWindow
[...]

QINFO : qmltestrunner::Shell::test_dragPanelToRestoreMaximizedWindow(with touch) toplevelwindowmodel: setFocusedWindow(Window[0x558eb3eaa7f0, id=1, MirSurface[0x558eb37ab290,"Unity 8 Mock Dashs window title"]])
FAIL! : qmltestrunner::Shell::test_dragPanelToRestoreMaximizedWindow(with touch) property state
   Actual (): maximized
   Expected (): restored
   Loc: [/home/michal/dev/canonical/unity8/repo/tests/qmltests/tst_Shell.qml(2553)]

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

Same with just this branch, the touch version of the test fails.

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

Fails here too (with xvfbtestShell works quite reliably but with testShell fails, seems to be dragging the wrong window)

review: Needs Fixing
2851. By Lukáš Tinkl

stabilize test

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

Yep, testfix fixes it :)

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

Yuppie.

review: Approve
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

PASSED: Continuous integration, rev:2851
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/3474/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4586
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/2766
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/2766
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4614
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4441
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4441/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4441
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4441/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4441
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4441/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4441
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4441/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4441
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4441/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4441
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4441/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/ApplicationMenus/MenuBar.qml'
2--- qml/ApplicationMenus/MenuBar.qml 2017-03-08 09:53:21 +0000
3+++ qml/ApplicationMenus/MenuBar.qml 2017-03-21 10:44:49 +0000
4@@ -52,6 +52,10 @@
5 d.dismissAll();
6 }
7
8+ function invokeMenu(mouseEvent) {
9+ mouseArea.onClicked(mouseEvent);
10+ }
11+
12 GlobalShortcut {
13 shortcut: Qt.Key_Alt|Qt.AltModifier
14 active: enableKeyFilter
15@@ -226,6 +230,7 @@
16 } // Row
17
18 MouseArea {
19+ id: mouseArea
20 anchors.fill: parent
21 hoverEnabled: d.currentItem
22
23
24=== modified file 'qml/Panel/Panel.qml'
25--- qml/Panel/Panel.qml 2017-03-08 09:53:35 +0000
26+++ qml/Panel/Panel.qml 2017-03-21 10:44:49 +0000
27@@ -174,6 +174,10 @@
28 // let it fall through to the window decoration of the maximized window behind, if any
29 mouse.accepted = false;
30 }
31+ var menubar = menuBarLoader.item;
32+ if (menubar) {
33+ menubar.invokeMenu(mouse);
34+ }
35 }
36
37 Row {
38@@ -200,16 +204,17 @@
39
40 Loader {
41 id: menuBarLoader
42+ objectName: "menuBarLoader"
43 height: parent.height
44 enabled: d.enablePointerMenu
45 opacity: d.showPointerMenu ? 1 : 0
46 visible: opacity != 0
47 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.SnapDuration } }
48- active: __applicationMenus.model
49+ active: __applicationMenus.model && !callHint.visible
50
51 width: parent.width - windowControlButtons.width - units.gu(2) - __indicators.barWidth
52
53- property bool menusRequested: menuBarLoader.item ? menuBarLoader.item.showRequested : false
54+ readonly property bool menusRequested: menuBarLoader.item ? menuBarLoader.item.showRequested : false
55
56 sourceComponent: MenuBar {
57 id: bar
58@@ -231,6 +236,7 @@
59 }
60
61 onDoubleClicked: PanelState.restoreClicked()
62+ onPressed: mouse.accepted = false // let the parent mouse area handle this, so it can both unsnap window and show menu
63 }
64 }
65 }
66
67=== modified file 'tests/qmltests/tst_Shell.qml'
68--- tests/qmltests/tst_Shell.qml 2017-03-08 09:54:00 +0000
69+++ tests/qmltests/tst_Shell.qml 2017-03-21 10:44:49 +0000
70@@ -2513,27 +2513,44 @@
71 tryCompare(app2Surface, "keymap", "fr");
72 }
73
74- function test_dragPanelToRestoreMaximizedWindow() {
75+ function test_dragPanelToRestoreMaximizedWindow_data() {
76+ return [
77+ { tag: "with mouse", mouse: true },
78+ { tag: "with touch", mouse: false }
79+ ]
80+ }
81+
82+ function test_dragPanelToRestoreMaximizedWindow(data) {
83 loadShell("desktop");
84 shell.usageScenario = "desktop";
85 waitForRendering(shell);
86 var panel = findChild(shell, "windowControlArea");
87 verify(panel);
88
89- var appSurfaceId = topLevelSurfaceList.nextId;
90- var app = ApplicationManager.startApplication("dialer-app")
91- waitUntilAppWindowIsFullyLoaded(appSurfaceId);
92-
93 // start dialer, maximize it
94- var appContainer = findChild(shell, "appContainer");
95- var appDelegate = findChild(appContainer, "appDelegate_" + appSurfaceId);
96+ var appDelegate = startApplication("dialer-app");
97 verify(appDelegate);
98+
99 var maximizeButton = findChild(appDelegate, "maximizeWindowButton");
100- mouseClick(maximizeButton);
101+ if (data.mouse) {
102+ mouseClick(maximizeButton);
103+ } else {
104+ tap(maximizeButton);
105+ }
106
107+ waitUntilTransitionsEnd(appDelegate);
108 tryCompare(appDelegate, "state", "maximized");
109
110- mouseDrag(panel, panel.width/2, panel.height/2, 0, shell.height/3, Qt.LeftButton, Qt.NoModifier, 500);
111+ if (data.mouse) {
112+ mouseMove(panel, panel.width/2, panel.panelHeight/2); // to reveal the menus
113+ var menuBarLoader = findInvisibleChild(panel, "menuBarLoader");
114+ verify(menuBarLoader);
115+ tryCompare(menuBarLoader.item, "visible", true);
116+ mouseDrag(panel, panel.width/2, panel.height/2, 0, shell.height/3, Qt.LeftButton, Qt.NoModifier, 500);
117+ } else {
118+ touchFlick(panel, panel.width/2, panel.panelHeight/2, panel.width/2, shell.height/3);
119+ }
120+
121 tryCompare(appDelegate, "state", "restored");
122 }
123
124@@ -2964,5 +2981,70 @@
125 mouseDoubleClickSequence(panel, panel.width/2, PanelState.panelHeight/2, Qt.LeftButton, Qt.NoModifier, 300);
126 tryCompare(appDelegate, "state", "restored");
127 }
128+
129+ function test_noMenusWithActiveCall() {
130+ loadShell("desktop");
131+ shell.usageScenario = "desktop";
132+ waitForRendering(shell);
133+ swipeAwayGreeter();
134+
135+ // start music-app, maximize it
136+ var appDelegate = startApplication("music-app")
137+ verify(appDelegate);
138+ appDelegate.requestMaximize();
139+
140+ // move the mouse over panel to reveal the menus
141+ var panel = findChild(shell, "panel");
142+ verify(panel);
143+ mouseMove(panel, panel.width/2, panel.panelHeight/2); // to reveal the menus
144+ var menuBarLoader = findInvisibleChild(panel, "menuBarLoader");
145+ verify(menuBarLoader);
146+ tryCompare(menuBarLoader.item, "visible", true);
147+
148+ // place a phone call
149+ callManager.foregroundCall = phoneCall;
150+
151+ // menu bar should be hidden
152+ tryCompare(menuBarLoader, "active", false);
153+ tryCompare(menuBarLoader, "item", null);
154+
155+ // remove call
156+ callManager.foregroundCall = null;
157+
158+ // menu bar should be revealed
159+ tryCompare(menuBarLoader, "active", true);
160+ tryCompare(menuBarLoader.item, "visible", true);
161+ }
162+
163+ function test_maximizedWindowAndMenuInPanel() {
164+ loadShell("desktop");
165+ shell.usageScenario = "desktop";
166+ waitForRendering(shell);
167+ swipeAwayGreeter();
168+
169+ // start music-app, maximize it
170+ var appDelegate = startApplication("music-app")
171+ verify(appDelegate);
172+ appDelegate.requestMaximize();
173+ tryCompare(appDelegate, "state", "maximized");
174+
175+ // move the mouse over panel to reveal the menus
176+ var panel = findChild(shell, "panel");
177+ verify(panel);
178+ mouseMove(panel, panel.width/2, panel.panelHeight/2); // to reveal the menus
179+ var menuBar = findChild(panel, "menuBar");
180+ verify(menuBar);
181+ tryCompare(menuBar, "visible", true);
182+
183+ // check that the menu popup appears
184+ var priv = findInvisibleChild(menuBar, "d");
185+ var menuItem0 = findChild(menuBar, "menuBar-item0");
186+ verify(menuItem0);
187+ mouseMove(menuItem0, menuItem0.width/2, menuItem0.height/2, 200);
188+ tryCompare(menuItem0, "visible", true);
189+ mouseClick(menuItem0);
190+ tryCompare(priv, "currentItem", menuItem0);
191+ tryCompare(priv.currentItem, "popupVisible", true);
192+ }
193 }
194 }

Subscribers

People subscribed via source and target branches