From 1b4ffa70c186c321bc84cb8a43fac2c1cfe10f20 Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Wed, 1 Jun 2016 00:37:33 +0200 Subject: [PATCH] Backed out changeset 7b5c8958c61c (bug 1270962) for often failing browser_readerMode.js. r=backout --- browser/base/content/test/general/browser.ini | 3 --- dom/base/test/mochitest.ini | 1 - dom/browser-element/mochitest/mochitest-oop.ini | 3 +-- dom/media/tests/mochitest/mochitest.ini | 1 + dom/tests/mochitest/general/mochitest.ini | 4 ---- 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/browser/base/content/test/general/browser.ini b/browser/base/content/test/general/browser.ini index 5c3a9d63f1ea..5d80e2c4c49d 100644 --- a/browser/base/content/test/general/browser.ini +++ b/browser/base/content/test/general/browser.ini @@ -167,7 +167,6 @@ skip-if = true # browser_bug321000.js is disabled because newline handling is sh [browser_bug406216.js] [browser_bug408415.js] [browser_bug409481.js] -subsuite = clipboard [browser_bug409624.js] [browser_bug413915.js] [browser_bug416661.js] @@ -285,7 +284,6 @@ skip-if = os == 'win' [browser_clipboard.js] subsuite = clipboard [browser_clipboard_pastefile.js] -subsuite = clipboard [browser_contentAreaClick.js] [browser_contextmenu.js] tags = fullscreen @@ -508,7 +506,6 @@ tags = mcb [browser_contextmenu_childprocess.js] [browser_bug963945.js] [browser_readerMode.js] -subsuite = clipboard support-files = readerModeArticle.html readerModeArticleHiddenNodes.html diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini index ecadff8ca8df..7425462e8aed 100644 --- a/dom/base/test/mochitest.ini +++ b/dom/base/test/mochitest.ini @@ -337,7 +337,6 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec [test_bug330925.xhtml] [test_bug331959.html] [test_bug333064.html] -subsuite = clipboard skip-if = toolkit == 'android' [test_bug333198.html] [test_bug333673.html] diff --git a/dom/browser-element/mochitest/mochitest-oop.ini b/dom/browser-element/mochitest/mochitest-oop.ini index b191a127df56..f0d5dcc1ff78 100644 --- a/dom/browser-element/mochitest/mochitest-oop.ini +++ b/dom/browser-element/mochitest/mochitest-oop.ini @@ -40,7 +40,6 @@ skip-if = (toolkit == 'gonk' && !debug) [test_browserElement_oop_Close.html] [test_browserElement_oop_CookiesNotThirdParty.html] [test_browserElement_oop_CopyPaste.html] -subsuite = clipboard [test_browserElement_oop_DOMRequestError.html] [test_browserElement_oop_DataURI.html] [test_browserElement_oop_DisallowEmbedAppsInOOP.html] @@ -132,4 +131,4 @@ tags = audiochannel [test_browserElement_oop_OpenWindowEmpty.html] skip-if = (toolkit == 'gonk') # Test doesn't work on B2G emulator [test_browserElement_oop_ActiveStateChangeOnChangingMutedOrVolume.html] -tags = audiochannel +tags = audiochannel \ No newline at end of file diff --git a/dom/media/tests/mochitest/mochitest.ini b/dom/media/tests/mochitest/mochitest.ini index 266f6c631766..cebe42781efd 100644 --- a/dom/media/tests/mochitest/mochitest.ini +++ b/dom/media/tests/mochitest/mochitest.ini @@ -129,6 +129,7 @@ skip-if = toolkit == 'gonk' # B2G emulator is too slow to handle a two-way audio skip-if = buildapp == 'b2g' || buildapp == 'mulet' || os == 'android' # bug 1043403 # Bug 1141029 Mulet parity with B2G Desktop for TC [test_peerConnection_bug1064223.html] [test_peerConnection_capturedVideo.html] +subsuite = clipboard tags=capturestream skip-if = toolkit == 'gonk' || buildapp == 'mulet' || android_version == '18' # b2g(Bug 960442, video support for WebRTC is disabled on b2g), android(Bug 1189784, timeouts on 4.3 emulator) [test_peerConnection_captureStream_canvas_2d.html] diff --git a/dom/tests/mochitest/general/mochitest.ini b/dom/tests/mochitest/general/mochitest.ini index 4c5a227242a6..06f382902133 100644 --- a/dom/tests/mochitest/general/mochitest.ini +++ b/dom/tests/mochitest/general/mochitest.ini @@ -65,7 +65,6 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec [test_bug861217.html] [test_clientRects.html] [test_clipboard_disallowed.html] -subsuite = clipboard [test_clipboard_events.html] subsuite = clipboard skip-if = buildapp == 'b2g' # b2g(clipboard undefined) b2g-debug(clipboard undefined) b2g-desktop(clipboard undefined) @@ -88,7 +87,6 @@ skip-if = buildapp == 'mulet' || buildapp == 'b2g' || toolkit == 'android' #TIME skip-if = buildapp == 'b2g' || buildapp == 'mulet' [test_img_mutations.html] [test_interfaces.html] -subsuite = clipboard skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage # [test_network_events.html] # Disable this test until bug 795711 is fixed. @@ -98,7 +96,6 @@ support-files = test_offsets.js [test_outerHTML.xhtml] skip-if = buildapp == 'mulet' [test_paste_selection.html] -subsuite = clipboard skip-if = buildapp == 'mulet' [test_performance_timeline.html] [test_picture_mutations.html] @@ -130,7 +127,6 @@ subsuite = clipboard skip-if = (toolkit == 'android') # Disabled on Android, see bug 1230231 [test_bug1161721.html] [test_bug1170911.html] -subsuite = clipboard [test_storagePermissionsAccept.html] skip-if = buildapp == 'b2g' # Bug 1184427 - no SSL certs on b2g [test_storagePermissionsRejectForeign.html]