wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

merge fx-team to mozilla-central a=merge

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-11-27 12:59:50 +01:00
commit 9332255184
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
browser/base/content/test/general/browser_alltabslistener.js
View File

@ -81,13 +81,14 @@ var gAllProgressListener = {
var gFrontNotifications, gAllNotifications, gFrontNotificationsPos, gAllNotificationsPos;
var gBackgroundTab, gForegroundTab, gBackgroundBrowser, gForegroundBrowser, gTestBrowser;
var gTestPage = "/browser/browser/base/content/test/general/alltabslistener.html";
const kBasePage = "http://example.org/browser/browser/base/content/test/general/dummy_page.html";
var gNextTest;
function test() {
waitForExplicitFinish();
gBackgroundTab = gBrowser.addTab("about:blank");
gForegroundTab = gBrowser.addTab("about:blank");
gBackgroundTab = gBrowser.addTab(kBasePage);
gForegroundTab = gBrowser.addTab(kBasePage);
gBackgroundBrowser = gBrowser.getBrowserForTab(gBackgroundTab);
gForegroundBrowser = gBrowser.getBrowserForTab(gForegroundTab);
gBrowser.selectedTab = gForegroundTab;

8
testing/mochitest/mach_commands.py
View File

@ -194,7 +194,7 @@ class MochitestRunner(MozbuildObject):
e10s=False, content_sandbox='off', dmd=False, dump_output_directory=None,
dump_about_memory_after_test=False, dump_dmd_after_test=False,
install_extension=None, quiet=False, environment=[], app_override=None, bisectChunk=None, runByDir=False,
useTestMediaDevices=False, **kwargs):
useTestMediaDevices=False, timeout=None, **kwargs):
"""Runs a mochitest.
test_paths are path to tests. They can be a relative path from the
@ -325,6 +325,8 @@ class MochitestRunner(MozbuildObject):
options.bisectChunk = bisectChunk
options.runByDir = runByDir
options.useTestMediaDevices = useTestMediaDevices
if timeout:
options.timeout = int(timeout)
options.failureFile = failure_file_path
if install_extension != None:
@ -569,6 +571,10 @@ def MochitestCommand(func):
"run tests against the distribution bundle's binary.");
func = app_override(func)
timeout = CommandArgument('--timeout', default=None,
help='The per-test timeout time in seconds (default: 60 seconds)');
func = timeout(func)
return func
def B2GCommand(func):