Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 8f2224b00d74 (bug 1290186) on request from whimboo

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2016-08-09 10:58:07 +02:00
parent c219b1530b
commit 404e9f87f9
2 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
testing/firefox-ui/tests/puppeteer/manifest.ini
View File

@ -20,3 +20,4 @@ tags = remote
[test_toolbars.py]
tags = remote
[test_windows.py]
skip-if = e10s # Bug 1292471

33
testing/firefox-ui/tests/puppeteer/test_windows.py
View File

@ -3,7 +3,7 @@
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
from marionette_driver import By, Wait
from marionette_driver.errors import NoSuchWindowException
from marionette_driver.errors import NoSuchWindowException, TimeoutException
import firefox_puppeteer.errors as errors
@ -11,32 +11,13 @@ from firefox_puppeteer.ui.windows import BaseWindow
from firefox_ui_harness.testcases import FirefoxTestCase
class BaseWindowTestCase(FirefoxTestCase):
def setUp(self):
"""
These tests open and close windows pretty rapidly, which
(since bug 1261842) can cause content processes to be
spawned and discarded in large numbers. By default, Firefox
has a 5 second timeout for shutting down content processes,
but we can get into cases where the content process just
doesn't have enough time to get itself all sorted before
the timeout gets hit, which results in the parent killing
the content process manually, which generates a crash report,
which causes these tests to orange. We side-step this by
setting dom.ipc.tabs.shutdownTimeoutSecs to 0, which disables
the shutdown timer.
"""
FirefoxTestCase.setUp(self)
self.marionette.set_pref('dom.ipc.tabs.shutdownTimeoutSecs', 0)
class TestWindows(BaseWindowTestCase):
class TestWindows(FirefoxTestCase):
def tearDown(self):
try:
self.windows.close_all([self.browser])
finally:
BaseWindowTestCase.tearDown(self)
FirefoxTestCase.tearDown(self)
def test_windows(self):
url = self.marionette.absolute_url('layout/mozilla.html')
@ -82,13 +63,13 @@ class TestWindows(BaseWindowTestCase):
self.assertEqual(len(self.windows.all), 1)
class TestBaseWindow(BaseWindowTestCase):
class TestBaseWindow(FirefoxTestCase):
def tearDown(self):
try:
self.windows.close_all([self.browser])
finally:
BaseWindowTestCase.tearDown(self)
FirefoxTestCase.tearDown(self)
def test_basics(self):
# force BaseWindow instance
@ -192,13 +173,13 @@ class TestBaseWindow(BaseWindowTestCase):
win1.switch_to()
class TestBrowserWindow(BaseWindowTestCase):
class TestBrowserWindow(FirefoxTestCase):
def tearDown(self):
try:
self.windows.close_all([self.browser])
finally:
BaseWindowTestCase.tearDown(self)
FirefoxTestCase.tearDown(self)
def test_basic(self):
self.assertNotEqual(self.browser.dtds, [])