Skip to content

Commit

Permalink
Backed out 3 changesets (bug 1852963) for causing remote failures on …
Browse files Browse the repository at this point in the history
…remote/shared/messagehandler/test/browser/browser_session_data.js CLOSED TREE

Backed out changeset 98de7bc404c3 (bug 1852963)
Backed out changeset edf1527c9a99 (bug 1852963)
Backed out changeset 34357750f69c (bug 1852963)
  • Loading branch information
Sandor Molnar committed Sep 14, 2023
1 parent 4bd577f commit 950a3c6
Show file tree
Hide file tree
Showing 621 changed files with 1,011 additions and 1,470 deletions.
18 changes: 6 additions & 12 deletions accessible/tests/browser/events/browser_test_docload.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ async function runTests(browser, accDoc) {
],
});

BrowserTestUtils.startLoadingURIString(
BrowserTestUtils.loadURIString(
browser,
`data:text/html;charset=utf-8,
<html><body id="body2">
Expand All @@ -59,7 +59,7 @@ async function runTests(browser, accDoc) {
[EVENT_REORDER, getAccessible(browser)],
]);

BrowserTestUtils.startLoadingURIString(browser, "about:about");
BrowserTestUtils.loadURIString(browser, "about:about");

await onLoadEvents;

Expand All @@ -79,7 +79,7 @@ async function runTests(browser, accDoc) {
[EVENT_REORDER, getAccessible(browser)],
]);

BrowserTestUtils.startLoadingURIString(browser, "about:mozilla");
BrowserTestUtils.loadURIString(browser, "about:mozilla");

await onLoadEvents;

Expand All @@ -100,11 +100,8 @@ async function runTests(browser, accDoc) {
[EVENT_REORDER, getAccessible(browser)],
]);

BrowserTestUtils.startLoadingURIString(
browser,
// eslint-disable-next-line @microsoft/sdl/no-insecure-url
"http://www.wronguri.wronguri/"
);
// eslint-disable-next-line @microsoft/sdl/no-insecure-url
BrowserTestUtils.loadURIString(browser, "http://www.wronguri.wronguri/");

await onLoadEvents;

Expand All @@ -114,10 +111,7 @@ async function runTests(browser, accDoc) {
[EVENT_REORDER, getAccessible(browser)],
]);

BrowserTestUtils.startLoadingURIString(
browser,
"https://nocert.example.com:443/"
);
BrowserTestUtils.loadURIString(browser, "https://nocert.example.com:443/");

await onLoadEvents;
}
Expand Down
2 changes: 1 addition & 1 deletion accessible/tests/browser/events/browser_test_textcaret.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ function caretMoveChecker(target, caretOffset) {
async function checkURLBarCaretEvents() {
const kURL = "about:mozilla";
let newWin = await BrowserTestUtils.openNewBrowserWindow();
BrowserTestUtils.startLoadingURIString(newWin.gBrowser.selectedBrowser, kURL);
BrowserTestUtils.loadURIString(newWin.gBrowser.selectedBrowser, kURL);
newWin.gBrowser.selectedBrowser.focus();

await waitForEvent(EVENT_DOCUMENT_LOAD_COMPLETE, event => {
Expand Down
2 changes: 1 addition & 1 deletion accessible/tests/mochitest/name/test_browserui.xhtml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
let docLoaded = waitForEvent(EVENT_DOCUMENT_LOAD_COMPLETE, event =>
event.accessible.QueryInterface(nsIAccessibleDocument).URL === ABOUT_LICENSE_URL,
`Loaded tab: ${ABOUT_LICENSE_URL}`);
BrowserTestUtils.startLoadingURIString(win.gBrowser.selectedBrowser,
BrowserTestUtils.loadURIString(win.gBrowser.selectedBrowser,
"about:license");
await loaded;
await docLoaded;
Expand Down
4 changes: 2 additions & 2 deletions browser/base/content/test/about/browser_aboutCertError.js
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ add_task(async function checkReturnToPreviousPage() {
tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, GOOD_PAGE);
browser = tab.linkedBrowser;

BrowserTestUtils.startLoadingURIString(browser, GOOD_PAGE_2);
BrowserTestUtils.loadURIString(browser, GOOD_PAGE_2);
await BrowserTestUtils.browserLoaded(browser, false, GOOD_PAGE_2);
await injectErrorPageFrame(tab, BAD_CERT);
} else {
Expand All @@ -93,7 +93,7 @@ add_task(async function checkReturnToPreviousPage() {

info("Loading and waiting for the cert error");
let certErrorLoaded = BrowserTestUtils.waitForErrorPage(browser);
BrowserTestUtils.startLoadingURIString(browser, BAD_CERT);
BrowserTestUtils.loadURIString(browser, BAD_CERT);
await certErrorLoaded;
}

Expand Down
6 changes: 3 additions & 3 deletions browser/base/content/test/about/browser_aboutNetError.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ add_task(async function onlyAllow3DESWithDeprecatedTLS() {
await BrowserTestUtils.withNewTab(
{ gBrowser, url: "about:blank" },
async browser => {
BrowserTestUtils.startLoadingURIString(browser, TRIPLEDES_PAGE);
BrowserTestUtils.loadURIString(browser, TRIPLEDES_PAGE);
await BrowserTestUtils.waitForErrorPage(browser);
}
);
Expand All @@ -223,7 +223,7 @@ add_task(async function onlyAllow3DESWithDeprecatedTLS() {
await BrowserTestUtils.withNewTab(
{ gBrowser, url: "about:blank" },
async browser => {
BrowserTestUtils.startLoadingURIString(browser, TRIPLEDES_PAGE);
BrowserTestUtils.loadURIString(browser, TRIPLEDES_PAGE);
await BrowserTestUtils.browserLoaded(browser, false, TRIPLEDES_PAGE);
}
);
Expand All @@ -236,7 +236,7 @@ add_task(async function onlyAllow3DESWithDeprecatedTLS() {
await BrowserTestUtils.withNewTab(
{ gBrowser, url: "about:blank" },
async browser => {
BrowserTestUtils.startLoadingURIString(browser, TRIPLEDES_PAGE);
BrowserTestUtils.loadURIString(browser, TRIPLEDES_PAGE);
await BrowserTestUtils.waitForErrorPage(browser);
}
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ async function setupPage(htmlPageName, blockedPage) {
true
);

BrowserTestUtils.startLoadingURIString(browser, iFramePage);
BrowserTestUtils.loadURIString(browser, iFramePage);
await browserLoaded;
info("The error page has loaded!");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ async function setupPage(htmlPageName, blockedPage) {
true
);

BrowserTestUtils.startLoadingURIString(browser, iFramePage);
BrowserTestUtils.loadURIString(browser, iFramePage);
await browserLoaded;
info("The error page has loaded!");

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,7 @@ add_task(async function bookmarks_toolbar_shown_on_newtab() {
ok(isBookmarksToolbarVisible(), "Toolbar should be visible on newtab");

// 2: Test that the toolbar is hidden when the browser is navigated away from newtab
BrowserTestUtils.startLoadingURIString(
newtab.linkedBrowser,
"https://example.com"
);
BrowserTestUtils.loadURIString(newtab.linkedBrowser, "https://example.com");
await BrowserTestUtils.browserLoaded(newtab.linkedBrowser);
await waitForBookmarksToolbarVisibility({
visible: false,
Expand All @@ -34,7 +31,7 @@ add_task(async function bookmarks_toolbar_shown_on_newtab() {
);

// 3: Re-load about:newtab in the browser for the following tests and confirm toolbar reappears
BrowserTestUtils.startLoadingURIString(newtab.linkedBrowser, "about:newtab");
BrowserTestUtils.loadURIString(newtab.linkedBrowser, "about:newtab");
await BrowserTestUtils.browserLoaded(newtab.linkedBrowser);
await waitForBookmarksToolbarVisibility({
visible: true,
Expand Down Expand Up @@ -68,7 +65,7 @@ add_task(async function bookmarks_toolbar_shown_on_newtab() {
});

// 7: Similar to #3 above, loading about:newtab in example should show toolbar
BrowserTestUtils.startLoadingURIString(example.linkedBrowser, "about:newtab");
BrowserTestUtils.loadURIString(example.linkedBrowser, "about:newtab");
await BrowserTestUtils.browserLoaded(example.linkedBrowser);
await waitForBookmarksToolbarVisibility({
visible: true,
Expand All @@ -91,10 +88,7 @@ add_task(async function bookmarks_toolbar_shown_on_newtab() {
await BrowserTestUtils.switchTab(gBrowser, newtab);
await waitForBookmarksToolbarVisibility({ visible: false });
ok(!isBookmarksToolbarVisible(), "Toolbar should hide with custom newtab");
BrowserTestUtils.startLoadingURIString(
example.linkedBrowser,
AboutNewTab.newTabURL
);
BrowserTestUtils.loadURIString(example.linkedBrowser, AboutNewTab.newTabURL);
await BrowserTestUtils.browserLoaded(example.linkedBrowser);
await BrowserTestUtils.switchTab(gBrowser, example);
await waitForBookmarksToolbarVisibility({ visible: true });
Expand Down
14 changes: 4 additions & 10 deletions browser/base/content/test/about/browser_aboutStopReload.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ add_task(async function checkDontShowStopFromLocalURI() {
stopReloadContainerObserver.observe(stopReloadContainer, {
attributeFilter: ["animate"],
});
BrowserTestUtils.startLoadingURIString(tab.linkedBrowser, "about:mozilla");
BrowserTestUtils.loadURIString(tab.linkedBrowser, "about:mozilla");
BrowserTestUtils.removeTab(tab);

Assert.ok(
Expand All @@ -82,7 +82,7 @@ add_task(async function checkDontShowStopFromNonLocalURI() {
stopReloadContainerObserver.observe(stopReloadContainer, {
attributeFilter: ["animate"],
});
BrowserTestUtils.startLoadingURIString(tab.linkedBrowser, "about:mozilla");
BrowserTestUtils.loadURIString(tab.linkedBrowser, "about:mozilla");
BrowserTestUtils.removeTab(tab);

Assert.ok(
Expand Down Expand Up @@ -132,10 +132,7 @@ add_task(async function checkAnimateStopOnTabAfterTabFinishesOpening() {
return !gBrowser.tabAnimationsInProgress;
});
let animatePromise = getAnimatePromise(stopReloadContainer);
BrowserTestUtils.startLoadingURIString(
tab.linkedBrowser,
"https://example.com"
);
BrowserTestUtils.loadURIString(tab.linkedBrowser, "https://example.com");
await animatePromise;
BrowserTestUtils.removeTab(tab);

Expand All @@ -161,10 +158,7 @@ add_task(async function checkDoShowStopFromLocalURI() {
return !gBrowser.tabAnimationsInProgress;
});
let animatePromise = getAnimatePromise(stopReloadContainer);
BrowserTestUtils.startLoadingURIString(
tab.linkedBrowser,
"https://example.com"
);
BrowserTestUtils.loadURIString(tab.linkedBrowser, "https://example.com");
await animatePromise;
await waitForNoAnimation(stopReloadContainer);
BrowserTestUtils.removeTab(tab);
Expand Down
2 changes: 1 addition & 1 deletion browser/base/content/test/about/browser_bug435325.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ add_task(async function checkSwitchPageToOnlineMode() {
let netErrorLoaded = BrowserTestUtils.waitForErrorPage(browser);

// eslint-disable-next-line @microsoft/sdl/no-insecure-url
BrowserTestUtils.startLoadingURIString(browser, "http://example.com/");
BrowserTestUtils.loadURIString(browser, "http://example.com/");
await netErrorLoaded;

// Re-enable the proxy so example.com is resolved to localhost, rather than
Expand Down
2 changes: 1 addition & 1 deletion browser/base/content/test/about/head.js
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ function promiseTabLoadEvent(tab, url) {
let loaded = BrowserTestUtils.browserLoaded(tab.linkedBrowser, false, handle);

if (url) {
BrowserTestUtils.startLoadingURIString(tab.linkedBrowser, url);
BrowserTestUtils.loadURIString(tab.linkedBrowser, url);
}

return loaded;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ let testcases = [
false,
CANONICAL_URL_REDIRECTED
);
BrowserTestUtils.startLoadingURIString(browser, CANONICAL_URL_REDIRECTED);
BrowserTestUtils.loadURIString(browser, CANONICAL_URL_REDIRECTED);
await loadPromise;
await freePortal(true);
ensurePortalTab(win);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ async function openTestPage() {
},
true /* maybeErrorPage */
);
BrowserTestUtils.startLoadingURIString(browser, testPage);
BrowserTestUtils.loadURIString(browser, testPage);
await pageAndIframesLoaded;

// Make sure both the top-level document and the iframe documents have
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@ async function rightClickOpenInNewTabAndReturnContent(selector) {
false,
RESOURCE_LINK
);
BrowserTestUtils.startLoadingURIString(
gBrowser.selectedBrowser,
RESOURCE_LINK
);
BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, RESOURCE_LINK);
await loaded;

const generatedBlobURL = await ContentTask.spawn(
Expand Down Expand Up @@ -100,10 +97,7 @@ async function openInNewTabAndReturnContent(selector) {
false,
RESOURCE_LINK
);
BrowserTestUtils.startLoadingURIString(
gBrowser.selectedBrowser,
RESOURCE_LINK
);
BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, RESOURCE_LINK);
await loaded;

const generatedBlobURL = await ContentTask.spawn(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ add_task(async function test_text_input_spellcheck_deadactor() {
contextMenu.hidePopup();

// Now go back to the input testcase:
BrowserTestUtils.startLoadingURIString(gBrowser.selectedBrowser, MAIN_URL);
BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, MAIN_URL);
await BrowserTestUtils.browserLoaded(
gBrowser.selectedBrowser,
false,
Expand All @@ -206,7 +206,7 @@ add_task(async function test_text_input_spellcheck_deadactor() {
wgp = gBrowser.selectedBrowser.browsingContext.currentWindowGlobal;

const NEW_URL = MAIN_URL.replace(".com", ".org");
BrowserTestUtils.startLoadingURIString(gBrowser.selectedBrowser, NEW_URL);
BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, NEW_URL);
await BrowserTestUtils.browserLoaded(
gBrowser.selectedBrowser,
false,
Expand All @@ -229,7 +229,7 @@ add_task(async function test_text_input_spellcheck_deadactor() {
// again; now the context menu stuff should be destroyed by the menu
// hiding, nothing else.
wgp = gBrowser.selectedBrowser.browsingContext.currentWindowGlobal;
BrowserTestUtils.startLoadingURIString(gBrowser.selectedBrowser, NEW_URL);
BrowserTestUtils.loadURIString(gBrowser.selectedBrowser, NEW_URL);
await BrowserTestUtils.browserLoaded(
gBrowser.selectedBrowser,
false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ add_task(async function test_back_forward_button_contextmenu_touch() {
() => !backbutton.hasAttribute("disabled")
);
// eslint-disable-next-line @microsoft/sdl/no-insecure-url
BrowserTestUtils.startLoadingURIString(browser, "http://example.org");
BrowserTestUtils.loadURIString(browser, "http://example.org");
await notDisabled;
await openAndCheckContextMenu(contextMenu, backbutton);

Expand Down
2 changes: 1 addition & 1 deletion browser/base/content/test/favicons/browser_bug408415.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ add_task(async function test() {
const expectedIcon = testPath + "file_generic_favicon.ico";
let faviconPromise = waitForLinkAvailable(tabBrowser);

BrowserTestUtils.startLoadingURIString(tabBrowser, URI);
BrowserTestUtils.loadURIString(tabBrowser, URI);

let iconURI = await faviconPromise;
is(iconURI, expectedIcon, "Correct icon before pushState.");
Expand Down
2 changes: 1 addition & 1 deletion browser/base/content/test/favicons/browser_bug550565.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ add_task(async function test() {
const expectedIcon = testPath + "file_generic_favicon.ico";
let faviconPromise = waitForLinkAvailable(tabBrowser);

BrowserTestUtils.startLoadingURIString(tabBrowser, URI);
BrowserTestUtils.loadURIString(tabBrowser, URI);

let iconURI = await faviconPromise;
is(iconURI, expectedIcon, "Correct icon before pushState.");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ add_task(async () => {
async browser => {
let faviconPromise = waitForFaviconMessage(true, `${ROOT}accept.sjs`);

BrowserTestUtils.startLoadingURIString(browser, ROOT + "accept.html");
BrowserTestUtils.loadURIString(browser, ROOT + "accept.html");
await BrowserTestUtils.browserLoaded(browser);

try {
Expand Down
2 changes: 1 addition & 1 deletion browser/base/content/test/favicons/browser_favicon_auth.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ add_task(async () => {
async browser => {
let faviconPromise = waitForFaviconMessage(true, `${ROOT}auth_test.png`);

BrowserTestUtils.startLoadingURIString(browser, `${ROOT}auth_test.html`);
BrowserTestUtils.loadURIString(browser, `${ROOT}auth_test.html`);
await BrowserTestUtils.browserLoaded(browser);

await Assert.rejects(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ add_task(async () => {
ok(seenCookie, "Should have seen the cookie.");

faviconPromise = waitForLinkAvailable(browser);
BrowserTestUtils.startLoadingURIString(browser, testPath);
BrowserTestUtils.loadURIString(browser, testPath);
await BrowserTestUtils.browserLoaded(browser);
await faviconPromise;
cookies = Services.cookies.getCookiesFromHost(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ add_task(async function () {
TEST_ROOT + "file_bug970276_favicon1.ico"
);

BrowserTestUtils.startLoadingURIString(extraTab.linkedBrowser, TEST_URL);
BrowserTestUtils.loadURIString(extraTab.linkedBrowser, TEST_URL);
await BrowserTestUtils.browserLoaded(extraTab.linkedBrowser);
await haveChanged;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ add_task(async function () {
let expectedFavicon = TEST_ROOT + "file_generic_favicon.ico";
let faviconPromise = waitForFavicon(extraTab.linkedBrowser, expectedFavicon);

BrowserTestUtils.startLoadingURIString(extraTab.linkedBrowser, TEST_URL);
BrowserTestUtils.loadURIString(extraTab.linkedBrowser, TEST_URL);
await BrowserTestUtils.browserLoaded(extraTab.linkedBrowser);

await faviconPromise;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function run_test(url, shouldHaveCookies, description) {
async browser => {
const faviconPromise = waitForFaviconMessage(true, FAVICON_URL);

BrowserTestUtils.startLoadingURIString(browser, url);
BrowserTestUtils.loadURIString(browser, url);
await BrowserTestUtils.browserLoaded(browser);

await faviconPromise;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,7 @@ function run_test(root, shouldSucceed, description) {
async browser => {
const faviconPromise = waitForFaviconMessage(true, FAVICON_URL);

BrowserTestUtils.startLoadingURIString(
browser,
`${root}crossorigin.html`
);
BrowserTestUtils.loadURIString(browser, `${root}crossorigin.html`);
await BrowserTestUtils.browserLoaded(browser);

if (shouldSucceed) {
Expand Down
Loading

0 comments on commit 950a3c6

Please sign in to comment.