@@ -69,7 +69,23 @@ def unlock_unity(unity_proxy_obj=None):
69 greeter = main_window.get_greeter()
69 greeter = main_window.get_greeter()
70 if greeter.created == False:
70 if greeter.created == False:
71 raise RuntimeWarning("Greeter appears to be already unlocked.")
71 raise RuntimeWarning("Greeter appears to be already unlocked.")
73+ # Because of potential input jerkiness under heavy load,
74+ # retry unlocking the greeter two times.
75+ # https://bugs.launchpad.net/ubuntu/+bug/1260113
72− greeter.swipe()
80+ greeter.swipe()
81+ except AssertionError:
85+ logger.info("Failed to unlock greeter, trying again...")
87+ logger.info("Greeter unlocked, continuing.")
75def restart_unity_with_testability(*args):
91def restart_unity_with_testability(*args):