Merge lp:~mzanetti/unity8/more-robust-lockscreen-tests into lp:unity8

[Michael Zanetti]

make entering text in lockscreen tests more robust

[Michał Sawicz (saviq)]

Yup, looking good.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:208
http://jenkins.qa.ubuntu.com/job/unity8-ci/641/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2281
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1110
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/642
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-ci/642/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-ci/641
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2287
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2287/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1943

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity8-autolanding/210/
Executed test runs:
    None: http://s-jenkins:8080/job/generic-cleanup-mbs/1460/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/2284
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-saucy/1112
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/209
        deb: http://jenkins.qa.ubuntu.com/job/unity8-saucy-armhf-autolanding/209/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-saucy-i386-autolanding/210
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2290
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/2290/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/1946

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'tests/autopilot/unity8/shell/tests/test_lock_screen.py'
--- tests/autopilot/unity8/shell/tests/test_lock_screen.py	2013-08-15 07:58:19 +0000
+++ tests/autopilot/unity8/shell/tests/test_lock_screen.py	2013-08-15 11:13:57 +0000
@@ -146,7 +146,8 @@
         pinentryField = self.main_window.get_pinentryField()
         self.touch.tap_object(pinentryField)
         self.assertThat(pinentryField.activeFocus, Eventually(Equals(True)))
-        self.keyboard.type(passphrase)
+        for character in passphrase:
+            self._type_character(character, pinentryField)
         logger.debug("Typed passphrase: %s", pinentryField.text)
         self.keyboard.type("\n")
 
@@ -164,6 +165,16 @@
         prompt = self.main_window.get_greeter().get_prompt()
         self.touch.tap_object(prompt)
         self.assertThat(prompt.activeFocus, Eventually(Equals(True)))
-        self.keyboard.type(passphrase)
+        for character in passphrase:
+            self._type_character(character, prompt)
         logger.debug("Typed passphrase: %s", prompt.text)
         self.keyboard.type("\n")
+
+    def _type_character(self, character, prompt, retries=5):
+        current_text = prompt.text
+        self.keyboard.type(character)
+        try:
+            self.assertThat(prompt.text, Eventually(Equals(current_text + character)))
+        except AssertionError:
+            if retries > 0:
+                self._type_character(character, prompt, retries-1)