Revert "intermittent in test_settings_from_message"

This reverts commit bad8f2f.
mozilla-b2g · Feb 26, 2014 · 88f2359 · 88f2359
1 parent c8d34e6
commit 88f2359
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/tests/python/gaia-ui-tests/gaiatest/apps/messages/regions/activities.py b/tests/python/gaia-ui-tests/gaiatest/apps/messages/regions/activities.py
@@ -13,8 +13,7 @@ class Activities(Base):
 
     def __init__(self, marionette):
         Base.__init__(self, marionette)
-        actions_menu = self.marionette.find_element(*self._actions_menu_locator)
-        self.wait_for_condition(lambda m: actions_menu.location['x']==0)
+        self.wait_for_element_displayed(*self._actions_menu_locator)
 
     def tap_settings(self):
         self.marionette.find_element(*self._settings_button_locator).tap()

diff --git a/tests/travis_ci/gaia_ui_tests/script b/tests/travis_ci/gaia_ui_tests/script
@@ -17,5 +17,4 @@ $gaiatest --app=b2gdesktop \
           --type=b2g \
           --timeout=10000 \
           --html-output artifacts/gaia_ui_tests_report.html \
-          --restart $root/tests/functional/messages/test_sms_to_settings.py \
-          --repeat=50
+          --restart $root/tests/manifest.ini