Merge into trunk : hide-greeter-on-focus-request : Code : Unity 8

Reviewer	Review Type	Date Requested	Status
Michał Sawicz		2014-04-14	Approve on 2014-04-15
PS Jenkins bot (community)	continuous-integration	2014-04-14	Needs Fixing on 2014-04-14
Michael Zanetti		2014-04-14	Pending
Albert Astals Cid		2014-04-14	Pending
Review via email: mp+215749@code.launchpad.net

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Zanetti (mzanetti) wrote on 2014-01-16: Posted in a previous version of this proposal

#

This should probably have an autopilot test

review: Needs Fixing

Revision history for this message

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

#

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

review: Approve (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2014-01-16: Posted in a previous version of this proposal

#

OK, there are two main 'focus an app' situations: opening the app for the first time and focusing the app that used to be open under the greeter. This bug was actually about situation 2.

I've added an autopilot test for situation 1, since that was lacking too. But situation 2 is hard for autopilot. We have to trigger a power button press to lock the greeter. I'm consulting with pitti about how to do it.

Revision history for this message

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

#

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

review: Approve (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2014-01-22: Posted in a previous version of this proposal

#

OK mzanetti, this now has the requested autopilot tests.

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Francis Ginther (fginther) wrote on 2014-01-23: Posted in a previous version of this proposal

#

Touch tests failed due to an issue with phablet-tools on the adb host. It has been resolved and this build has been restarted.

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2014-01-24: Posted in a previous version of this proposal

#

The new autopilot test unity8.application_lifecycle.tests.test_application_lifecycle.ApplicationLifecycleTests.test_greeter_hides_on_app_focus is failing in jenkins. But it is working on my device. :(

Is there a trick to get a more jenkins-like environment?

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

There's https://wiki.canonical.com/UbuntuEngineering/CI/Playbook/UpstreamMerger#Reproducing_generic-mediumtests-runner_touch_testing

Revision history for this message

Michael Terry (mterry) wrote on 2014-01-27: Posted in a previous version of this proposal

#

I did try those steps. Still can't reproduce.

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

Doesn't merge cleanly anymore

review: Needs Fixing

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

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

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-03-03: Posted in a previous version of this proposal

#

Hey, what's the status of this?

review: Needs Information

Revision history for this message

Michael Terry (mterry) wrote on 2014-03-04: Posted in a previous version of this proposal

#

There seems to be a crash during AP tests... I wouldn't think this branch would introduce a crash. Is there a known crash problem in trunk?

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-03-04: Posted in a previous version of this proposal

#

Yeah, qt crashes - is fixed in 5.2.

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-17: Posted in a previous version of this proposal

#

Unfortunately doesn't merge cleanly again against trunk ^_^

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-17: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-20: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-21: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-25: Posted in a previous version of this proposal

#

Doesn't merge cleanly with trunk again :-/

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-03-25: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-03-31: Posted in a previous version of this proposal

#

So i installed everything http://s-jenkins.ubuntu-ci:8080//view/mediumtests/job/generic-mediumtests-builder-trusty-armhf/3837/artifact/*zip*/archive.zip in my phone and after stopping unity8 and running

autopilot run unity8.application_lifecycle.tests.test_application_lifecycle.ApplicationLifecycleTests.test_greeter_hides_on_app_focus

i get

Traceback (most recent call last):
  File "/usr/lib/python2.7/dist-packages/unity8/shell/__init__.py", line 48, in wrapper
    return fn(*args, **kwargs)
  File "/usr/lib/python2.7/dist-packages/unity8/application_lifecycle/tests/test_application_lifecycle.py", line 189, in test_greeter_hides_on_app_focus
    self.assertThat(greeter.created, Eventually(Equals(True)))
  File "/usr/lib/python2.7/dist-packages/testtools/testcase.py", line 406, in assertThat
    raise mismatch_error
MismatchError: After 10.0 seconds test on Greeter.created failed: True != dbus.Boolean(False, variant_level=1)

Mike, can you reproduce this? Does it work for you?

review: Needs Fixing

Revision history for this message

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

#

Text conflict in qml/Shell.qml

review: Needs Fixing

Revision history for this message

Michael Terry (mterry) wrote on 2014-04-08: Posted in a previous version of this proposal

#

Albert, I've merged from trunk and hopefully made the test more robust. Try now.

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-08: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-09: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-10: Posted in a previous version of this proposal

#

I think we have a problem here and is that autopilot tests are run with powerd-cli forcing the display on and thus your lock_unity does not work on CI

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-10: Posted in a previous version of this proposal

#

Confirmed with Saviq that this happens so we need to find a solution here.

review: Needs Fixing

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-10: Posted in a previous version of this proposal

#

Also, please do not rely on real apps, use the fixtures from UITK, see lp:~elopio/unity8/use_fake_instead_of_messaging/ for an example.

review: Needs Fixing

Revision history for this message

Albert Astals Cid (aacid) wrote on 2014-04-11: Posted in a previous version of this proposal

#

And there is a .THIS file that needs to go away

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-14:

#

lock_unity won't work during test runs, as powerd is locked with screen on during those... Either powerd would need to be fixed to change the power state on explicit power key press (screen does go off already), or think of something to make unity8 lock regardless of powerd's requests...

review: Needs Fixing

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-14: Posted in a previous version of this proposal

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2014-04-14:

#

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

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2014-04-14:

#

Yup, Saviq. I've got a branch to fix powerd: https://code.launchpad.net/~mterry/powerd/consistent-state/+merge/215761

Revision history for this message

Michał Sawicz (saviq) wrote on 2014-04-15:

#

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

* Did CI run pass? If not, please explain why.
Otto broken, two failing tests on mako require the powerd changes.

review: Approve

 === modified file 'qml/Shell.qml'
 --- qml/Shell.qml	2014-04-01 18:35:33 +0000
 +++ qml/Shell.qml	2014-04-14 19:50:06 +0000
@@ -240,6 +240,8 @@
          function show(focusApp) {
              shown = true;
              panel.indicators.hide();
++            edgeDemo.stopDemo();
++            greeter.hide();
              if (!ApplicationManager.focusedApplicationId && ApplicationManager.count > 0 && focusApp) {
                  ApplicationManager.focusApplication(ApplicationManager.get(0).appId);
+             }
@@ -267,12 +269,6 @@
                          stages.hide();
+                     }
+                 }
--
--                // If any app is focused when greeter is open, it's due to a user action
--                // like a snap decision (say, an incoming call).
--                // TODO: these should be protected to only unlock for certain applications / certain usecases
--                // potentially only in connection with a notification.
--                greeter.hide()
+             }
              onApplicationAdded: {
@@ -559,12 +555,9 @@
+                 }
+             }
              onDashSwipeChanged: if (dashSwipe && stages.shown) dash.setCurrentScope("clickscope", false, true)
--            onLauncherApplicationSelected:{
--                if (edgeDemo.running)
--                    return;
--
--                greeter.hide()
--                shell.activateApplication(appId)
++            onLauncherApplicationSelected: {
++                if (!edgeDemo.running)
++                    shell.activateApplication(appId)
+             }
              onShownChanged: {
                  if (shown) {
 === modified file 'tests/autopilot/unity8/application_lifecycle/tests/__init__.py'
 --- tests/autopilot/unity8/application_lifecycle/tests/__init__.py	2014-04-14 19:50:06 +0000
 +++ tests/autopilot/unity8/application_lifecycle/tests/__init__.py	2014-04-14 19:50:06 +0000
@@ -35,7 +35,10 @@
          process_helpers.unlock_unity(unity_proxy)
      def create_test_application(self):
--        fake_application = fixture_setup.FakeApplication()
++        desktop_file_dict = fixture_setup.DEFAULT_DESKTOP_FILE_DICT
++        desktop_file_dict.update({'X-Ubuntu-Single-Instance': 'true'})
++        fake_application = fixture_setup.FakeApplication(
++            desktop_file_dict=desktop_file_dict)
          self.useFixture(fake_application)
          return (
              fake_application.qml_file_path, fake_application.desktop_file_path)
 === modified file 'tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py'
 --- tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-04-14 19:50:06 +0000
 +++ tests/autopilot/unity8/application_lifecycle/tests/test_application_lifecycle.py	2014-04-14 19:50:06 +0000
@@ -24,8 +24,11 @@
  import logging
  import os
++from autopilot.matchers import Eventually
  from autopilot.platform import model
++from testtools.matchers import Equals
++from unity8 import process_helpers
  from unity8.application_lifecycle import tests
@@ -86,3 +89,29 @@
          self.swipe_screen_from_right()
          self.assert_current_focused_application(application1_name)
++
++    def test_greeter_hides_on_app_open(self):
++        """Greeter should hide when an app is opened"""
++        process_helpers.lock_unity()
++        greeter = self.main_window.get_greeter()
++        self.assertThat(greeter.created, Eventually(Equals(True)))
++
++        application_name = self.launch_fake_app()
++        self.assertThat(greeter.created, Eventually(Equals(False)))
++        self.assert_current_focused_application(application_name)
++
++    def test_greeter_hides_on_app_focus(self):
++        """Greeter should hide when an app is re-focused"""
++        application_name = self.launch_fake_app()
++        self.assert_current_focused_application(application_name)
++
++        self.main_window.show_dash_swiping()
++        self.assert_current_focused_application('')
++
++        process_helpers.lock_unity()
++        greeter = self.main_window.get_greeter()
++        self.assertThat(greeter.created, Eventually(Equals(True)))
++
++        self.launch_upstart_application(application_name)
++        self.assertThat(greeter.created, Eventually(Equals(False)))
++        self.assert_current_focused_application(application_name)
 === modified file 'tests/autopilot/unity8/process_helpers.py'
 --- tests/autopilot/unity8/process_helpers.py	2014-02-23 01:46:02 +0000
 +++ tests/autopilot/unity8/process_helpers.py	2014-04-14 19:50:06 +0000
@@ -89,6 +89,22 @@
              break
++def lock_unity(unity_proxy_obj=None):
++    """Helper function that attempts to lock the unity greeter."""
++    import evdev, time
++    uinput = evdev.UInput(name='unity8-autopilot-power-button',
++                          devnode='/dev/autopilot-uinput')
++    # One press and release to turn screen off (locking unity)
++    uinput.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 1)
++    uinput.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 0)
++    uinput.syn()
++    time.sleep(1)
++    # And another press and release to turn screen back on
++    uinput.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 1)
++    uinput.write(evdev.ecodes.EV_KEY, evdev.ecodes.KEY_POWER, 0)
++    uinput.syn()
++
++
  def restart_unity_with_testability(*args):
      """Restarts (or starts) unity with testability enabled.
 === modified file 'tests/qmltests/tst_Shell.qml'
 --- tests/qmltests/tst_Shell.qml	2014-04-02 15:59:40 +0000
 +++ tests/qmltests/tst_Shell.qml	2014-04-14 19:50:06 +0000
@@ -554,5 +554,16 @@
              tryCompare(searchIndicator, "opacity", 0);
+         }
++
++        function test_focusRequestedHidesGreeter() {
++            var greeter = findChild(shell, "greeter")
++
++            greeter.show()
++            tryCompare(greeter, "showProgress", 1)
++
++            ApplicationManager.focusRequested("notes-app")
++            tryCompare(greeter, "showProgress", 0)
++            waitUntilApplicationWindowIsFullyVisible()
++        }
+     }
+ }

Unity 8

Merge lp:~mterry/unity8/hide-greeter-on-focus-request into lp:unity8

Commit message

Description of the change

Preview Diff

Subscribers