зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1515201 - Avoid loading about:blank in the privileged content process during AWSY tests. r=erahm
Differential Revision: https://phabricator.services.mozilla.com/D14920 --HG-- extra : moz-landing-system : lando
This commit is contained in:
Родитель
8f40e22ce1
Коммит
260710ce45
|
@ -1,3 +1,5 @@
|
||||||
|
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||||
|
# vim: set filetype=python:
|
||||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||||
|
@ -301,16 +303,17 @@ class AwsyTestCase(MarionetteTestCase):
|
||||||
page_to_load = self.urls()[self._pages_loaded % len(self.urls())]
|
page_to_load = self.urls()[self._pages_loaded % len(self.urls())]
|
||||||
tabs_loaded = len(self._tabs)
|
tabs_loaded = len(self._tabs)
|
||||||
is_new_tab = False
|
is_new_tab = False
|
||||||
|
open_tab_script = r"""
|
||||||
|
gBrowser.loadOneTab("about:blank", {
|
||||||
|
inBackground: false,
|
||||||
|
triggeringPrincipal: Services.scriptSecurityManager.getSystemPrincipal(),
|
||||||
|
});
|
||||||
|
"""
|
||||||
|
|
||||||
if tabs_loaded < self._maxTabs and tabs_loaded <= self._pages_loaded:
|
if tabs_loaded < self._maxTabs and tabs_loaded <= self._pages_loaded:
|
||||||
full_tab_list = self.marionette.window_handles
|
full_tab_list = self.marionette.window_handles
|
||||||
|
|
||||||
# Trigger opening a new tab by finding the new tab button and
|
self.marionette.execute_script(open_tab_script, script_timeout=60000)
|
||||||
# clicking it
|
|
||||||
newtab_button = (self.marionette.find_element('id', 'tabbrowser-tabs')
|
|
||||||
.find_element('anon attribute',
|
|
||||||
{'anonid': 'tabs-newtab-button'}))
|
|
||||||
newtab_button.click()
|
|
||||||
|
|
||||||
self.wait_for_condition(lambda mn: len(
|
self.wait_for_condition(lambda mn: len(
|
||||||
mn.window_handles) == tabs_loaded + 1)
|
mn.window_handles) == tabs_loaded + 1)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче