Merge pull request #27197 from bebef1987/phone

Bug 1118728 - Update Phone app object to wait for the app to launch

tests/python/gaia-ui-tests/gaiatest/apps/phone/app.py

@@ -3,6 +3,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from marionette.by import By
+from marionette import expected
+from marionette import Wait
 from gaiatest.apps.base import Base
 
 
@@ -22,6 +24,12 @@ class Phone(Base):
     _contacts_toolbar_locator = (By.ID, 'iframe-contacts-container')
     _contacts_frame_locator = (By.ID, 'iframe-contacts')
 
+    def launch(self):
+        Base.launch(self)
+
+        Wait(self.marionette).until(
+            expected.element_displayed(*self._keypad_toolbar_button_locator))
+
     @property
     def keypad(self):
         from gaiatest.apps.phone.regions.keypad import Keypad