61 lines
3.1 KiB
Diff
61 lines
3.1 KiB
Diff
|
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
|
||
|
|
@@ -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
|
||
|
|
pref(browser.send_pings,true) asserts(0-2) load 1257730-1.html # bug 566159
|
||
|
|
-load 1331295.html
|
||
|
|
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
|
||
|
|
@@ -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
|
||
|
|
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-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)
|
||
|
|
|
||
|
|
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("""
|
||
|
|
- 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
|
||
|
|
|
||
|
|
|
||
|
|
MYPY = False
|