Update to 85.0

1 files changed, 17 insertions, 18 deletions

diff --git a/firefox-testing.patch b/firefox-testing.patch
index 965dd1a..ae07de4 100644
--- a/firefox-testing.patch
+++ b/firefox-testing.patch
@@ -1,6 +1,6 @@
-diff -up firefox-84.0/docshell/base/crashtests/crashtests.list.testing firefox-84.0/docshell/base/crashtests/crashtests.list
---- firefox-84.0/docshell/base/crashtests/crashtests.list.testing	2020-12-07 23:32:58.000000000 +0100
-+++ firefox-84.0/docshell/base/crashtests/crashtests.list	2020-12-10 12:42:49.725237640 +0100
+diff -up firefox-85.0/docshell/base/crashtests/crashtests.list.testing firefox-85.0/docshell/base/crashtests/crashtests.list
+--- firefox-85.0/docshell/base/crashtests/crashtests.list.testing	2021-01-18 19:29:32.000000000 +0100
++++ firefox-85.0/docshell/base/crashtests/crashtests.list	2021-01-21 09:45:17.767276466 +0100
 @@ -13,7 +13,6 @@ load 614499-1.html
  load 678872-1.html
  skip-if(Android) pref(dom.disable_open_during_load,false) load 914521.html # Android bug 1584562
@@ -9,21 +9,20 @@ diff -up firefox-84.0/docshell/base/crashtests/crashtests.list.testing firefox-8
  load 1341657.html
  load 1584467.html
  load 1614211-1.html
-diff -up firefox-84.0/dom/media/tests/crashtests/crashtests.list.testing firefox-84.0/dom/media/tests/crashtests/crashtests.list
---- firefox-84.0/dom/media/tests/crashtests/crashtests.list.testing	2020-12-08 00:35:04.000000000 +0100
-+++ firefox-84.0/dom/media/tests/crashtests/crashtests.list	2020-12-10 12:42:49.725237640 +0100
-@@ -24,7 +24,7 @@ asserts-if(Android,0-1) pref(browser.lin
- asserts-if(Android,0-1) pref(browser.link.open_newwindow,2) load 1429507_2.html # window.open() in tab doesn't work for crashtest in e10s, this opens a new window instead
+diff -up firefox-85.0/dom/media/tests/crashtests/crashtests.list.testing firefox-85.0/dom/media/tests/crashtests/crashtests.list
+--- firefox-85.0/dom/media/tests/crashtests/crashtests.list.testing	2021-01-21 09:45:17.767276466 +0100
++++ firefox-85.0/dom/media/tests/crashtests/crashtests.list	2021-01-21 09:48:35.245124690 +0100
+@@ -25,7 +25,6 @@ asserts-if(Android,0-1) pref(browser.lin
+ load 1443212.html
  asserts-if(Android,0-2) load 1453030.html
  load 1468451.html
 -skip-if(Android) load 1490700.html # No screenshare on Android
-+#skip-if(Android) load 1490700.html # No screenshare on Android and Wayland
  load 1505957.html
  load 1509442.html
  load 1511130.html
-diff -up firefox-84.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py.testing firefox-84.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py
---- firefox-84.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py.testing	2020-12-10 12:42:49.725237640 +0100
-+++ firefox-84.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py	2020-12-10 12:54:22.885925814 +0100
+diff -up firefox-85.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py.testing firefox-85.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py
+--- firefox-85.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py.testing	2021-01-18 19:30:26.000000000 +0100
++++ firefox-85.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py	2021-01-21 09:45:17.767276466 +0100
 @@ -69,15 +69,7 @@ class TestMarionette(MarionetteTestCase)
  
      def test_application_update_disabled(self):
@@ -41,18 +40,18 @@ diff -up firefox-84.0/testing/marionette/harness/marionette_harness/tests/unit/t
          self.assertFalse(update_allowed)
  
  
-diff --git a/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt b/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt
---- a/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt
-+++ b/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt
+diff -up firefox-85.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt.testing firefox-85.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt
+--- firefox-85.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt.testing	2021-01-18 19:30:19.000000000 +0100
++++ firefox-85.0/testing/tools/websocketprocessbridge/websocketprocessbridge_requirements_3.txt	2021-01-21 09:45:17.767276466 +0100
 @@ -1,4 +1,5 @@
  # This file is the websocketprocess requirements.txt used with python 3.
 +pyrsistent
  
  # needed by txws, and we'd like pip to get it from the local server before setuptools tries pypi
  six
-diff -up firefox-84.0/toolkit/crashreporter/test/unit/xpcshell.ini.old firefox-84.0/toolkit/crashreporter/test/unit/xpcshell.ini
---- firefox-84.0/toolkit/crashreporter/test/unit/xpcshell.ini.old	2020-12-15 12:21:16.177169732 +0100
-+++ firefox-84.0/toolkit/crashreporter/test/unit/xpcshell.ini	2020-12-15 12:21:22.336348783 +0100
+diff -up firefox-85.0/toolkit/crashreporter/test/unit/xpcshell.ini.testing firefox-85.0/toolkit/crashreporter/test/unit/xpcshell.ini
+--- firefox-85.0/toolkit/crashreporter/test/unit/xpcshell.ini.testing	2021-01-18 19:31:16.000000000 +0100
++++ firefox-85.0/toolkit/crashreporter/test/unit/xpcshell.ini	2021-01-21 09:45:17.767276466 +0100
 @@ -37,7 +37,7 @@ skip-if = (os != 'win' && os != 'linux')
  
  [test_crash_AsyncShutdown.js]