From 40a355a42d4a9444dc753c04c6608dade2f06a23 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:27 +0200 Subject: Adding upstream version 125.0.1. Signed-off-by: Daniel Baumann --- netwerk/test/browser/browser_103_assets.js | 2 +- netwerk/test/browser/browser_103_cleanup.js | 2 +- netwerk/test/browser/browser_103_private_window.js | 2 +- .../test/browser/browser_103_redirect_from_server.js | 2 +- netwerk/test/browser/browser_NetUtil.js | 2 +- netwerk/test/browser/browser_cookie_filtering_basic.js | 12 +++++++----- netwerk/test/browser/browser_cookie_filtering_oa.js | 18 +++++++++++++++--- .../test/browser/browser_cookie_sync_across_tabs.js | 2 +- .../test/browser/browser_nsIFormPOSTActionChannel.js | 6 +++--- netwerk/test/browser/browser_test_io_activity.js | 4 ++-- 10 files changed, 33 insertions(+), 19 deletions(-) (limited to 'netwerk/test/browser') diff --git a/netwerk/test/browser/browser_103_assets.js b/netwerk/test/browser/browser_103_assets.js index 4e32c8bf7c..0d2ad354f2 100644 --- a/netwerk/test/browser/browser_103_assets.js +++ b/netwerk/test/browser/browser_103_assets.js @@ -41,7 +41,7 @@ async function test_hint_asset(testName, asset, variant) { let observer = { QueryInterface: ChromeUtils.generateQI(["nsIObserver"]), - observe(aSubject, aTopic, aData) { + observe(aSubject, aTopic) { if (aTopic == "earlyhints-connectback") { numConnectBackRemaining -= 1; } diff --git a/netwerk/test/browser/browser_103_cleanup.js b/netwerk/test/browser/browser_103_cleanup.js index c823f5f01a..9609312e02 100644 --- a/netwerk/test/browser/browser_103_cleanup.js +++ b/netwerk/test/browser/browser_103_cleanup.js @@ -16,7 +16,7 @@ add_task(async function test_103_cancel_parent_connect() { let observed_cancel_reason = ""; let observer = { QueryInterface: ChromeUtils.generateQI(["nsIObserver"]), - observe(aSubject, aTopic, aData) { + observe(aSubject, aTopic) { aSubject = aSubject.QueryInterface(Ci.nsIRequest); if ( aTopic == "http-on-stop-request" && diff --git a/netwerk/test/browser/browser_103_private_window.js b/netwerk/test/browser/browser_103_private_window.js index 7d23ea4b28..909bec0143 100644 --- a/netwerk/test/browser/browser_103_private_window.js +++ b/netwerk/test/browser/browser_103_private_window.js @@ -35,7 +35,7 @@ async function test_early_hints_load_url(usePrivateWin) { let observed = {}; let observer = { QueryInterface: ChromeUtils.generateQI(["nsIObserver"]), - observe(aSubject, aTopic, aData) { + observe(aSubject, aTopic) { if (aTopic == "http-on-opening-request") { let channel = aSubject.QueryInterface(Ci.nsIHttpChannel); if (channel.URI.spec === expectedUrl) { diff --git a/netwerk/test/browser/browser_103_redirect_from_server.js b/netwerk/test/browser/browser_103_redirect_from_server.js index 0357d11516..2edf15ba97 100644 --- a/netwerk/test/browser/browser_103_redirect_from_server.js +++ b/netwerk/test/browser/browser_103_redirect_from_server.js @@ -111,7 +111,7 @@ async function test_hint_redirect( if (numRequestRemaining > 0) { let observer = { QueryInterface: ChromeUtils.generateQI(["nsIObserver"]), - observe(aSubject, aTopic, aData) { + observe(aSubject, aTopic) { aSubject.QueryInterface(Ci.nsIIdentChannel); let id = aSubject.channelId; if (observedChannelIds.includes(id)) { diff --git a/netwerk/test/browser/browser_NetUtil.js b/netwerk/test/browser/browser_NetUtil.js index 09875a5280..791498f031 100644 --- a/netwerk/test/browser/browser_NetUtil.js +++ b/netwerk/test/browser/browser_NetUtil.js @@ -107,5 +107,5 @@ WindowListener.prototype = { { once: true } ); }, - onCloseWindow(aXULWindow) {}, + onCloseWindow() {}, }; diff --git a/netwerk/test/browser/browser_cookie_filtering_basic.js b/netwerk/test/browser/browser_cookie_filtering_basic.js index e51bed5bc5..c5dfb622ab 100644 --- a/netwerk/test/browser/browser_cookie_filtering_basic.js +++ b/netwerk/test/browser/browser_cookie_filtering_basic.js @@ -104,15 +104,17 @@ async function test_basic_suite_org_duplicate() { let parentpid = Services.appinfo.processID; let pid1 = testStruct1.browser.frameLoader.remoteTab.osPid; let pid3 = testStruct3.browser.frameLoader.remoteTab.osPid; - ok( - parentpid != pid1, + Assert.notEqual( + parentpid, + pid1, "Parent pid should differ from content process for 1st example.org" ); - ok( - parentpid != pid3, + Assert.notEqual( + parentpid, + pid3, "Parent pid should differ from content process for 2nd example.org" ); - ok(pid1 != pid3, "Content pids should differ from each other"); + Assert.notEqual(pid1, pid3, "Content pids should differ from each other"); await SpecialPowers.spawn( testStruct1.browser, diff --git a/netwerk/test/browser/browser_cookie_filtering_oa.js b/netwerk/test/browser/browser_cookie_filtering_oa.js index f69ad09e81..13102a1954 100644 --- a/netwerk/test/browser/browser_cookie_filtering_oa.js +++ b/netwerk/test/browser/browser_cookie_filtering_oa.js @@ -119,9 +119,21 @@ async function test_private() { let parentpid = Services.appinfo.processID; let privatePid = testStruct5.browser.frameLoader.remoteTab.osPid; let pid = testStruct2.browser.frameLoader.remoteTab.osPid; - ok(parentpid != privatePid, "Parent and private processes are unique"); - ok(parentpid != pid, "Parent and non-private processes are unique"); - ok(privatePid != pid, "Private and non-private processes are unique"); + Assert.notEqual( + parentpid, + privatePid, + "Parent and private processes are unique" + ); + Assert.notEqual( + parentpid, + pid, + "Parent and non-private processes are unique" + ); + Assert.notEqual( + privatePid, + pid, + "Private and non-private processes are unique" + ); // example.com await SpecialPowers.spawn( diff --git a/netwerk/test/browser/browser_cookie_sync_across_tabs.js b/netwerk/test/browser/browser_cookie_sync_across_tabs.js index 127bb2555b..483169ed44 100644 --- a/netwerk/test/browser/browser_cookie_sync_across_tabs.js +++ b/netwerk/test/browser/browser_cookie_sync_across_tabs.js @@ -34,7 +34,7 @@ add_task(async function () { let pid2 = browser2.frameLoader.remoteTab.osPid; // Note, this might not be true once fission is implemented (Bug 1451850) - ok(pid1 != pid2, "We should have different processes here."); + Assert.notEqual(pid1, pid2, "We should have different processes here."); await SpecialPowers.spawn(browser1, [], async function () { is(content.document.cookie, "", "Expecting no cookies"); diff --git a/netwerk/test/browser/browser_nsIFormPOSTActionChannel.js b/netwerk/test/browser/browser_nsIFormPOSTActionChannel.js index e791794579..20ef3840f3 100644 --- a/netwerk/test/browser/browser_nsIFormPOSTActionChannel.js +++ b/netwerk/test/browser/browser_nsIFormPOSTActionChannel.js @@ -26,7 +26,7 @@ CustomProtocolHandler.prototype = { newChannel(aURI, aLoadInfo) { return new CustomChannel(aURI, aLoadInfo); }, - allowPort(port, scheme) { + allowPort(port) { return port != -1; }, @@ -56,7 +56,7 @@ CustomChannel.prototype = { set uploadStream(val) { throw Components.Exception("", Cr.NS_ERROR_NOT_IMPLEMENTED); }, - setUploadStream(aStream, aContentType, aContentLength) { + setUploadStream(aStream) { this._uploadStream = aStream; }, @@ -172,7 +172,7 @@ document.getElementById('form').submit(); get status() { return Cr.NS_OK; }, - cancel(status) {}, + cancel() {}, loadGroup: null, loadFlags: Ci.nsIRequest.LOAD_NORMAL | diff --git a/netwerk/test/browser/browser_test_io_activity.js b/netwerk/test/browser/browser_test_io_activity.js index 1e9cb29b6d..b6f498ed5f 100644 --- a/netwerk/test/browser/browser_test_io_activity.js +++ b/netwerk/test/browser/browser_test_io_activity.js @@ -35,8 +35,8 @@ add_task(async function testRequestIOActivity() { waitForExplicitFinish(); Services.obs.notifyObservers(null, "profile-initial-state"); - await BrowserTestUtils.withNewTab(TEST_URL, async function (browser) { - await BrowserTestUtils.withNewTab(TEST_URL2, async function (browser) { + await BrowserTestUtils.withNewTab(TEST_URL, async function () { + await BrowserTestUtils.withNewTab(TEST_URL2, async function () { let results = await ChromeUtils.requestIOActivity(); processResults(results); -- cgit v1.2.3