Merge branch 'master' into f33

1 files changed, 35 insertions, 35 deletions

diff --git a/firefox-tests-xpcshell.patch b/firefox-tests-xpcshell.patch
index 96c27b8..8f9edf8 100644
--- a/firefox-tests-xpcshell.patch
+++ b/firefox-tests-xpcshell.patch
@@ -1,6 +1,6 @@
-diff -up firefox-84.0.2/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-84.0.2/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini
---- firefox-84.0.2/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-01-05 19:12:21.000000000 +0100
-+++ firefox-84.0.2/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini	2021-01-12 20:30:45.681412210 +0100
+diff -up firefox-85.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini
+--- firefox-85.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-01-18 19:29:32.000000000 +0100
++++ firefox-85.0/browser/components/enterprisepolicies/tests/xpcshell/xpcshell.ini	2021-01-21 09:49:44.587178226 +0100
 @@ -6,7 +6,6 @@ support-files =
  
  [test_3rdparty.js]
@@ -9,9 +9,9 @@ diff -up firefox-84.0.2/browser/components/enterprisepolicies/tests/xpcshell/xpc
  [test_bug1658259.js]
  [test_cleanup.js]
  [test_clear_blocked_cookies.js]
-diff -up firefox-84.0.2/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-84.0.2/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini
---- firefox-84.0.2/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-01-05 19:12:22.000000000 +0100
-+++ firefox-84.0.2/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini	2021-01-12 20:30:45.681412210 +0100
+diff -up firefox-85.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini
+--- firefox-85.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-01-18 19:29:32.000000000 +0100
++++ firefox-85.0/devtools/client/shared/remote-debugging/adb/xpcshell/xpcshell.ini	2021-01-21 09:49:44.587178226 +0100
 @@ -6,6 +6,5 @@ skip-if = toolkit == 'android' || socket
  support-files =
    adb.py
@@ -19,9 +19,9 @@ diff -up firefox-84.0.2/devtools/client/shared/remote-debugging/adb/xpcshell/xpc
 -[test_adb.js]
  run-sequentially = An extension having the same id is installed/uninstalled in different tests
  [test_prepare-tcp-connection.js]
-diff -up firefox-84.0.2/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell firefox-84.0.2/netwerk/test/unit_ipc/xpcshell.ini
---- firefox-84.0.2/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell	2021-01-14 11:03:10.741711483 +0100
-+++ firefox-84.0.2/netwerk/test/unit_ipc/xpcshell.ini	2021-01-14 11:03:17.498910928 +0100
+diff -up firefox-85.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/netwerk/test/unit_ipc/xpcshell.ini
+--- firefox-85.0/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshell	2021-01-18 19:29:59.000000000 +0100
++++ firefox-85.0/netwerk/test/unit_ipc/xpcshell.ini	2021-01-21 09:49:44.587178226 +0100
 @@ -70,7 +70,6 @@ support-files =
  [test_channel_close_wrap.js]
  [test_cookiejars_wrap.js]
@@ -30,9 +30,9 @@ diff -up firefox-84.0.2/netwerk/test/unit_ipc/xpcshell.ini.firefox-tests-xpcshel
  [test_duplicate_headers_wrap.js]
  [test_event_sink_wrap.js]
  [test_head_wrap.js]
-diff -up firefox-84.0.2/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-84.0.2/netwerk/test/unit/xpcshell.ini
---- firefox-84.0.2/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-01-05 21:29:48.000000000 +0100
-+++ firefox-84.0.2/netwerk/test/unit/xpcshell.ini	2021-01-14 11:02:39.939802295 +0100
+diff -up firefox-85.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/netwerk/test/unit/xpcshell.ini
+--- firefox-85.0/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-01-18 19:30:19.000000000 +0100
++++ firefox-85.0/netwerk/test/unit/xpcshell.ini	2021-01-21 09:50:27.536450133 +0100
 @@ -199,7 +199,6 @@ skip-if = true # Bug 863738
  [test_cookies_upgrade_10.js]
  [test_dns_cancel.js]
@@ -77,15 +77,15 @@ diff -up firefox-84.0.2/netwerk/test/unit/xpcshell.ini.firefox-tests-xpcshell fi
 @@ -409,7 +403,6 @@ skip-if = tsan || socketprocess_networki
  run-sequentially = node server exceptions dont replay well
  skip-if = socketprocess_networking
- [test_esni_dns_fetch.js]
+ [test_dns_by_type_resolve.js]
 -[test_network_connectivity_service.js]
  [test_suspend_channel_on_authRetry.js]
  [test_suspend_channel_on_examine_merged_response.js]
  [test_bug1527293.js]
-diff -up firefox-84.0.2/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-84.0.2/security/manager/ssl/tests/unit/xpcshell.ini
---- firefox-84.0.2/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell	2021-01-14 11:05:59.458691431 +0100
-+++ firefox-84.0.2/security/manager/ssl/tests/unit/xpcshell.ini	2021-01-14 11:06:51.073214918 +0100
-@@ -175,7 +175,6 @@ run-sequentially = hardcoded ports
+diff -up firefox-85.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/security/manager/ssl/tests/unit/xpcshell.ini
+--- firefox-85.0/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tests-xpcshell	2021-01-18 19:29:59.000000000 +0100
++++ firefox-85.0/security/manager/ssl/tests/unit/xpcshell.ini	2021-01-21 09:49:44.588178255 +0100
+@@ -180,7 +180,6 @@ run-sequentially = hardcoded ports
  run-sequentially = hardcoded ports
  [test_ocsp_url.js]
  run-sequentially = hardcoded ports
@@ -93,9 +93,9 @@ diff -up firefox-84.0.2/security/manager/ssl/tests/unit/xpcshell.ini.firefox-tes
  [test_osreauthenticator.js]
  # Reauthentication has been implemented on Windows and MacOS, so running this
  # test results in the OS popping up a dialog, which means we can't run it in
-diff -up firefox-84.0.2/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell firefox-84.0.2/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
---- firefox-84.0.2/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell	2021-01-05 19:12:27.000000000 +0100
-+++ firefox-84.0.2/security/manager/ssl/tests/unit/xpcshell-smartcards.ini	2021-01-12 20:30:45.681412210 +0100
+diff -up firefox-85.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell firefox-85.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini
+--- firefox-85.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.firefox-tests-xpcshell	2021-01-18 19:29:59.000000000 +0100
++++ firefox-85.0/security/manager/ssl/tests/unit/xpcshell-smartcards.ini	2021-01-21 09:49:44.588178255 +0100
 @@ -7,7 +7,6 @@ support-files =
  
  [test_osclientcerts_module.js]
@@ -104,18 +104,18 @@ diff -up firefox-84.0.2/security/manager/ssl/tests/unit/xpcshell-smartcards.ini.
  [test_pkcs11_moduleDB.js]
  [test_pkcs11_safe_mode.js]
  [test_pkcs11_slot.js]
-diff -up firefox-84.0.2/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-84.0.2/toolkit/components/commandlines/test/unit/xpcshell.ini
---- firefox-84.0.2/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-01-05 19:12:33.000000000 +0100
-+++ firefox-84.0.2/toolkit/components/commandlines/test/unit/xpcshell.ini	2021-01-12 20:30:45.681412210 +0100
+diff -up firefox-85.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/toolkit/components/commandlines/test/unit/xpcshell.ini
+--- firefox-85.0/toolkit/components/commandlines/test/unit/xpcshell.ini.firefox-tests-xpcshell	2021-01-18 19:31:16.000000000 +0100
++++ firefox-85.0/toolkit/components/commandlines/test/unit/xpcshell.ini	2021-01-21 09:49:44.588178255 +0100
 @@ -7,4 +7,3 @@ support-files =
  
  [test_classinfo.js]
  [test_bug666224.js]
 -[test_resolvefile.js]
-diff -up firefox-84.0.2/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell firefox-84.0.2/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
---- firefox-84.0.2/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell	2021-01-14 11:07:47.513880856 +0100
-+++ firefox-84.0.2/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini	2021-01-14 11:08:33.169228446 +0100
-@@ -69,8 +69,6 @@ skip-if = socketprocess_networking
+diff -up firefox-85.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell firefox-85.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini
+--- firefox-85.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini.firefox-tests-xpcshell	2021-01-18 19:31:16.000000000 +0100
++++ firefox-85.0/toolkit/components/extensions/test/xpcshell/xpcshell-common.ini	2021-01-21 09:49:44.588178255 +0100
+@@ -73,8 +73,6 @@ skip-if = socketprocess_networking || os
  skip-if = os == "android" # downloads API needs to be implemented in GeckoView - bug 1538348
  [test_ext_downloads_download.js]
  skip-if = appname == "thunderbird" || os == "android" || tsan # tsan: bug 1612707
@@ -124,7 +124,7 @@ diff -up firefox-84.0.2/toolkit/components/extensions/test/xpcshell/xpcshell-com
  [test_ext_downloads_private.js]
  skip-if = os == "android"
  [test_ext_downloads_search.js]
-@@ -230,8 +228,6 @@ skip-if = appname == "thunderbird" || os
+@@ -241,8 +239,6 @@ skip-if = appname == "thunderbird" || os
  skip-if = appname == "thunderbird" || os == "android" # Bug 1350559
  [test_ext_permissions_uninstall.js]
  skip-if = appname == "thunderbird" || os == "android" # Bug 1350559
@@ -133,9 +133,9 @@ diff -up firefox-84.0.2/toolkit/components/extensions/test/xpcshell/xpcshell-com
  [test_proxy_incognito.js]
  skip-if = os == "android" # incognito not supported on android
  [test_proxy_info_results.js]
-diff -up firefox-84.0.2/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-84.0.2/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
---- firefox-84.0.2/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-01-05 19:12:34.000000000 +0100
-+++ firefox-84.0.2/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini	2021-01-12 20:30:45.681412210 +0100
+diff -up firefox-85.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini
+--- firefox-85.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-01-18 19:30:38.000000000 +0100
++++ firefox-85.0/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini	2021-01-21 09:49:44.588178255 +0100
 @@ -7,6 +7,5 @@ support-files =
    data_text_file.txt
    data_test_script.py
@@ -143,10 +143,10 @@ diff -up firefox-84.0.2/toolkit/modules/subprocess/test/xpcshell/xpcshell.ini.fi
 -[test_subprocess.js]
  [test_subprocess_getEnvironment.js]
  [test_subprocess_pathSearch.js]
-diff -up firefox-84.0.2/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-84.0.2/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
---- firefox-84.0.2/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-01-05 21:29:48.000000000 +0100
-+++ firefox-84.0.2/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-01-12 20:30:45.681412210 +0100
-@@ -97,7 +97,6 @@ tags = webextensions
+diff -up firefox-85.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell firefox-85.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini
+--- firefox-85.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini.firefox-tests-xpcshell	2021-01-18 19:30:38.000000000 +0100
++++ firefox-85.0/toolkit/mozapps/extensions/test/xpcshell/xpcshell.ini	2021-01-21 09:49:44.588178255 +0100
+@@ -94,7 +94,6 @@ tags = webextensions
  head = head_addons.js head_sideload.js
  skip-if = os == "linux" # Bug 1613268
  [test_sideloads.js]