Bug 1182079 - Fix intermittent test failure loading the Loop's ui-showcase on debug builds by extending the page load timeout, and improve the failure naming. r=andreio

browser/components/loop/test/shared/frontend_tester.py

@@ -72,7 +72,9 @@ class BaseTestFrontendUnits(MarionetteTestCase):
 
         # This extends the timeout for find_element. We need this as the tests
         # take an amount of time to run after loading, which we have to wait for.
-        self.marionette.set_search_timeout(60000)
+        self.marionette.set_search_timeout(120000)
+
+        self.marionette.timeouts("page load", 120000)
 
     # srcdir_path should be the directory relative to this file.
     def set_server_prefix(self, srcdir_path):

browser/components/loop/test/standalone/test_standalone_all.py

@@ -6,10 +6,10 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'shared'))
 from frontend_tester import BaseTestFrontendUnits
 
 
-class TestDesktopUnits(BaseTestFrontendUnits):
+class TestStandaloneUnits(BaseTestFrontendUnits):
 
     def setUp(self):
-        super(TestDesktopUnits, self).setUp()
+        super(TestStandaloneUnits, self).setUp()
         self.set_server_prefix("../standalone/")
 
     def test_units(self):

browser/components/loop/test/ui-showcase/test_ui-showcase.py

@@ -6,10 +6,10 @@ sys.path.append(os.path.join(os.path.dirname(__file__), '..', 'shared'))
 from frontend_tester import BaseTestFrontendUnits
 
 
-class TestDesktopUnits(BaseTestFrontendUnits):
+class TestUiShowcaseUnits(BaseTestFrontendUnits):
 
     def setUp(self):
-        super(TestDesktopUnits, self).setUp()
+        super(TestUiShowcaseUnits, self).setUp()
         self.set_server_prefix("../../ui/")
 
     def test_units(self):