64 lines
3.5 KiB
Diff
64 lines
3.5 KiB
Diff
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
|
|
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
|
|
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
|
|
load 1505957.html
|
|
load 1509442.html
|
|
load 1511130.html
|
|
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):
|
|
# 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)
|
|
|
|
|
|
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-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]
|
|
[test_event_files.js]
|
|
-[test_crash_terminator.js]
|
|
+#[test_crash_terminator.js]
|
|
|
|
[test_crash_heap_corruption.js]
|
|
skip-if = os != 'win'
|