Merge lp:~om26er/jenkins-launchpad-plugin/fix_unlock_script into lp:~canonical-ci-engineering/jenkins-launchpad-plugin/autopilot-testrunner-touch-saucy

[Omer Akram]

use unity helpers to unlock screen

unity is removing the bottom bar so the interface that we were relying on is going away, now using unity helpers to unlock the screen.

depends on unity8-autopilot

[Andy Doan (doanac)]

On 03/06/2014 02:13 PM, Omer Akram wrote:
> Omer Akram has proposed merging lp:~om26er/jenkins-launchpad-plugin/fix_unlock_script into lp:~canonical-ci-engineering/jenkins-launchpad-plugin/autopilot-testrunner-touch-saucy.
>
> Commit message:
> use unity helpers to unlock screen
>
> Requested reviews:
> Canonical CI Engineering (canonical-ci-engineering)
>
> For more details, see:
> https://code.launchpad.net/~om26er/jenkins-launchpad-plugin/fix_unlock_script/+merge/209773
>
> unity is removing the bottom bar so the interface that we were relying on is going away, now using unity helpers to unlock the screen.
>

Omer - are we going to need a similar patch to:

<http://bazaar.launchpad.net/~ubuntu-test-case-dev/ubuntu-test-cases/touch/view/head:/utils/target/unlock_screen.py>

?

[Omer Akram (om26er)]

On it.

On Fri, Mar 7, 2014 at 2:45 AM, Andy Doan <email address hidden>wrote:

> On 03/06/2014 02:13 PM, Omer Akram wrote:
> > Omer Akram has proposed merging
> lp:~om26er/jenkins-launchpad-plugin/fix_unlock_script into
> lp:~canonical-ci-engineering/jenkins-launchpad-plugin/autopilot-testrunner-touch-saucy.
> >
> > Commit message:
> > use unity helpers to unlock screen
> >
> > Requested reviews:
> > Canonical CI Engineering (canonical-ci-engineering)
> >
> > For more details, see:
> >
> https://code.launchpad.net/~om26er/jenkins-launchpad-plugin/fix_unlock_script/+merge/209773
> >
> > unity is removing the bottom bar so the interface that we were relying
> on is going away, now using unity helpers to unlock the screen.
> >
>
> Omer - are we going to need a similar patch to:
>
>
> <
> http://bazaar.launchpad.net/~ubuntu-test-case-dev/ubuntu-test-cases/touch/view/head:/utils/target/unlock_screen.py
> >
>
> ?
>
> --
>
> https://code.launchpad.net/~om26er/jenkins-launchpad-plugin/fix_unlock_script/+merge/209773
> You are the owner of lp:~om26er/jenkins-launchpad-plugin/fix_unlock_script.
>

[lp:~om26er/jenkins-launchpad-plugin/fix_unlock_script]

125. By Omer Akram on 2014-03-06

restart_with_testability is private

126. By Omer Akram on 2014-03-06

add link to the bug

Unmerged revisions

126. By Omer Akram on 2014-03-06

add link to the bug

125. By Omer Akram on 2014-03-06

restart_with_testability is private

=== modified file 'unlock_screen.py'
--- unlock_screen.py	2013-10-17 19:40:43 +0000
+++ unlock_screen.py	2014-03-06 22:31:45 +0000
@@ -1,106 +1,52 @@
 #!/usr/bin/env python
 
-from autopilot import introspection
-from autopilot.display import Display
-from autopilot.input import Pointer, Touch
+import logging
+import sys
+
+from unity8 import process_helpers as helpers
+
 import dbus
-import os
-import sys
-import time
+
+logging.basicConfig(level=logging.INFO)
+
+
+def unlock_screen():
+    _restart_with_testability()
+    helpers.unlock_unity()
+
+
+def _restart_with_testability():
+    powerd = _get_powerd_interface()
+    powerd_cookie = _take_powerd_screen_lock(powerd)
+    helpers.restart_unity_with_testability()
+    _release_powerd_screen_lock(powerd, powerd_cookie)
+
+
+def _get_powerd_interface():
+    bus = dbus.SystemBus()
+    return bus.get_object('com.canonical.powerd', '/com/canonical/powerd')
+
+
+def _take_powerd_screen_lock(powerd):
+    logging.info('Taking screen lock (http://pad.lv/1236525).')
+    return powerd.requestSysState(
+        "autopilot-lock", 1, dbus_interface='com.canonical.powerd'
+    )
+
+
+def _release_powerd_screen_lock(powerd, powerd_cookie):
+    logging.info('Releasing screen lock (http://pad.lv/1236525)')
+    powerd.clearSysState(
+        powerd_cookie, dbus_interface='com.canonical.powerd'
+    )
 
 
 def help():
     print "Usage:"
-    print "Run the script without any argument to unlock with assertion"
-    print ""
-    print "option -q:"
-    print "Execute with parameter -q to unlock the screen quickly without introspection"
-
-
-def start_unity_in_testability():
-    override_file = "~/.config/upstart/unity8.override"
-
-    os.system('echo "exec unity8 -testability" > ~/.config/upstart/unity8.override')
-
-    print "----------------------------------------------------------------------"
-    print "Stopping Unity"
-    os.system('/sbin/stop unity8')
-    print "Unity stopped"
-    os.system('rm -f /tmp/mir_socket')
-
-    print "----------------------------------------------------------------------"
-    print "Taking screen lock (#1235000)"
-    bus = dbus.SystemBus()
-    powerd = bus.get_object('com.canonical.powerd', '/com/canonical/powerd')
-    powerd_cookie = powerd.requestSysState("autopilot-lock", 1, dbus_interface='com.canonical.powerd')
-    print "----------------------------------------------------------------------"
-    print "Starting Unity with testability"
-    os.system('/sbin/start unity8')
-    print "Unity started"
-    print "----------------------------------------------------------------------"
-    print "Releasing screen lock (#1235000)"
-    powerd.clearSysState(powerd_cookie, dbus_interface='com.canonical.powerd')
-
-    print "----------------------------------------------------------------------"
-    if os.path.exists(override_file):
-        os.remove(override_file)
-    print "Cleaned up upstart override"
-    print "----------------------------------------------------------------------"
-
-    print "Turning on the screen"
-    print ""
-
-
-def unlock_screen():
-    print "----------------------------------------------------------------------"
-    print "Executing Swipe"
-    input_device = Touch.create()
-    pointing_device = Pointer(input_device)
-    conn = "com.canonical.Shell.BottomBarVisibilityCommunicator"
-    unity8 = introspection.get_proxy_object_for_existing_process(connection_name=conn)
-    greeter = unity8.select_single("Greeter")
-    x, y, w, h = greeter.globalRect
-    tx = x + w
-    ty = y + (h / 2)
-
-    pointing_device.drag(tx, ty, tx / 2, ty)
-    try:
-        greeter.shown.wait_for(False)
-        print "----------------------------------------------------------------------"
-        print "THE SCREEN UNLOCKED (normal)"
-    except:
-        print "----------------------------------------------------------------------"
-        print "THE SCREEN DIDN'T UNLOCK THE FIRST TRY, NOW ATTEMPTING A BLIND SWIPE"
-        unlock_screen_blind(greeter)
-
-
-def unlock_screen_blind(greeter=None):
-    input_device = Touch.create()
-    pointing_device = Pointer(input_device)
-    x, y, w, h = Display.create(preferred_backend='UPA').get_screen_geometry(0)
-    tx = x + w
-    ty = y + (h / 2)
-
-    pointing_device.drag(tx, ty, tx / 2, ty)
-    if greeter is not None:
-        try:
-            greeter.shown.wait_for(False)
-            if greeter.shown is False:
-                print ""
-                print "THE SCREEN UNLOCKED (blind)"
-        except:
-            print "----------------------------------------------------------------------"
-            "THE SCREEN DIDN'T UNLOCK, RESTART THE DEVICE AND RUN THE SCRIPT AGAIN"
-
-
-if len(sys.argv) >= 2 and sys.argv[1] == '-q':
-    # Blind unlock only
-    unlock_screen_blind()
-elif len(sys.argv) >= 2 and sys.argv[1] == '-r':
-    # Restart only
-    start_unity_in_testability()
-elif len(sys.argv) >= 2 and sys.argv[1] == '-h':
+    print "Run the script without any argument to unlock with assertion."
+
+
+if len(sys.argv) >= 2 and sys.argv[1] == '-h':
     help()
 else:
-    start_unity_in_testability()
     unlock_screen()