Updated to Firefox 84

1 files changed, 22 insertions, 30 deletions

diff --git a/firefox-testing.patch b/firefox-testing.patch
index 04ef0f3..c973db6 100644
--- a/firefox-testing.patch
+++ b/firefox-testing.patch
@@ -1,6 +1,6 @@
-diff -up firefox-83.0/docshell/base/crashtests/crashtests.list.test firefox-83.0/docshell/base/crashtests/crashtests.list
---- firefox-83.0/docshell/base/crashtests/crashtests.list.test	2020-11-12 19:04:36.000000000 +0100
-+++ firefox-83.0/docshell/base/crashtests/crashtests.list	2020-11-19 10:30:26.127468382 +0100
+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
 @@ -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,8 +9,9 @@ diff -up firefox-83.0/docshell/base/crashtests/crashtests.list.test firefox-83.0
  load 1341657.html
  load 1584467.html
  load 1614211-1.html
---- firefox-83.0/dom/media/tests/crashtests/crashtests.list.test	2020-11-19 10:42:04.960128784 +0100
-+++ firefox-83.0/dom/media/tests/crashtests/crashtests.list	2020-11-19 10:42:21.508182030 +0100
+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
  asserts-if(Android,0-2) load 1453030.html
@@ -20,41 +21,32 @@ diff -up firefox-83.0/docshell/base/crashtests/crashtests.list.test firefox-83.0
  load 1505957.html
  load 1509442.html
  load 1511130.html
-diff -up firefox-83.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py.old firefox-83.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py
---- firefox-83.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py.old	2020-11-19 11:15:59.150990819 +0100
-+++ firefox-83.0/testing/marionette/harness/marionette_harness/tests/unit/test_marionette.py	2020-11-19 11:17:53.390337862 +0100
-@@ -62,16 +62,9 @@ class TestMarionette(MarionetteTestCase)
+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
+@@ -69,15 +69,7 @@ class TestMarionette(MarionetteTestCase)
  
      def test_application_update_disabled(self):
          # Updates of the application should always be disabled by default
 -        with self.marionette.using_context("chrome"):
--            update_allowed = self.marionette.execute_script("""
+-            update_allowed = self.marionette.execute_script(
+-                """
 -              let aus = Cc['@mozilla.org/updates/update-service;1']
 -                        .getService(Ci.nsIApplicationUpdateService);
 -              return aus.canCheckForUpdates;
--            """)
+-            """
+-            )
 -
 +        update_allowed = False
          self.assertFalse(update_allowed)
  
--
- class TestContext(MarionetteTestCase):
- 
-     def setUp(self):
-diff -up firefox-83.0/testing/web-platform/tests/tools/manifest/vcs.py.old firefox-83.0/testing/web-platform/tests/tools/manifest/vcs.py
---- firefox-83.0/testing/web-platform/tests/tools/manifest/vcs.py.old	2020-11-19 11:37:03.591683420 +0100
-+++ firefox-83.0/testing/web-platform/tests/tools/manifest/vcs.py	2020-11-19 11:37:18.730715053 +0100
-@@ -9,11 +9,8 @@ from six.moves.collections_abc import Mu
- 
- from .utils import git
- 
--try:
--    from ..gitignore import gitignore
--except ValueError:
--    # relative import beyond toplevel throws *ValueError*!
--    from gitignore import gitignore  # type: ignore
-+# relative import beyond toplevel throws *ValueError*!
-+from gitignore import gitignore  # type: ignore
  
+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
+@@ -1,4 +1,5 @@
+ # This file is the websocketprocess requirements.txt used with python 3.
++pyrsistent
  
- MYPY = False
+ # needed by txws, and we'd like pip to get it from the local server before setuptools tries pypi
+ six