Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/browser-element. r?RyanVM draft
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sat, 05 Nov 2016 11:29:15 +0100
changeset 434253 61dd3dc055d3628034da60317be46df78e17c3f2
parent 434252 a8ba455d6a75c55a7dc7a1d675ca08f02eb9d0a3
child 434254 d385eedee96d8845dc76a8f6b534f60fd5ed5e50
push id34753
push userarchaeopteryx@coole-files.de
push dateSat, 05 Nov 2016 10:33:00 +0000
reviewersRyanVM
bugs1310297
milestone52.0a1
Bug 1310297 - Remove test annotations using b2g, mulet or gonk: dom/browser-element. r?RyanVM MozReview-Commit-ID: 9efYUFizAM7
dom/browser-element/mochitest/chrome.ini
dom/browser-element/mochitest/mochitest-oop.ini
dom/browser-element/mochitest/mochitest.ini
--- a/dom/browser-element/mochitest/chrome.ini
+++ b/dom/browser-element/mochitest/chrome.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || e10s || toolkit == 'android' # Bug 1287720: takes too long on android
+skip-if = e10s || toolkit == 'android' # Bug 1287720: takes too long on android
 
 support-files =
   audio.ogg
   async.js
   browserElementTestHelpers.js
   browserElement_ActiveStateChange.js
   browserElement_AudioChannelSeeking.js
   browserElement_AudioChannelMutedByDefault.js
--- a/dom/browser-element/mochitest/mochitest-oop.ini
+++ b/dom/browser-element/mochitest/mochitest-oop.ini
@@ -11,27 +11,24 @@ support-files =
   browserElement_OpenTab.js
 
 [test_browserElement_oop_AudioChannelSeeking.html]
 tags = audiochannel
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_Viewmode.html]
 [test_browserElement_oop_ThemeColor.html]
 [test_browserElement_inproc_ErrorSecurity.html]
-skip-if = toolkit=='gonk'
 [test_browserElement_inproc_OpenMixedProcess.html]
-# skip-if = toolkit=='gonk' || (toolkit == 'gonk' && !debug)
 disabled = disabled for bug 1266035
 [test_browserElement_oop_Alert.html]
 [test_browserElement_oop_AlertInFrame.html]
 [test_browserElement_oop_AudioChannelMutedByDefault.html]
 tags = audiochannel
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_Auth.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_oop_BackForward.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_BadScreenshot.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_BrowserWindowResize.html]
 [test_browserElement_oop_Close.html]
 [test_browserElement_oop_CookiesNotThirdParty.html]
 [test_browserElement_oop_CopyPaste.html]
@@ -39,87 +36,74 @@ subsuite = clipboard
 [test_browserElement_oop_DOMRequestError.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_DataURI.html]
 [test_browserElement_oop_DocumentFirstPaint.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_Download.html]
 disabled = bug 1022281
 [test_browserElement_oop_ErrorSecurity.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_oop_ExecuteScript.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_Find.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_FirstPaint.html]
 [test_browserElement_oop_ForwardName.html]
 [test_browserElement_oop_FrameWrongURI.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_oop_GetScreenshot.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_GetScreenshotDppx.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_Iconchange.html]
 [test_browserElement_oop_LoadEvents.html]
 [test_browserElement_oop_Manifestchange.html]
 [test_browserElement_oop_Metachange.html]
 [test_browserElement_oop_NoAudioTrack.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_AudioPlayback.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_OpenMixedProcess.html]
-# skip-if = (toolkit == 'gonk' && !debug)
 disabled = disabled for bug 1266035
 [test_browserElement_oop_OpenNamed.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_oop_OpenWindow.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_oop_OpenWindowDifferentOrigin.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_oop_OpenWindowInFrame.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_oop_OpenWindowRejected.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_oop_Opensearch.html]
 [test_browserElement_oop_OpenTab.html]
-# skip-if = (toolkit == 'gonk') # Disabled on emulator. See bug 1144015 comment 8
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_PrivateBrowsing.html]
 skip-if = e10s # Bug 1315042
 [test_browserElement_oop_PromptCheck.html]
 [test_browserElement_oop_PromptConfirm.html]
-# Disabled on B2G Emulator because permission cannot be asserted in content process,
-# need to fix either bug 1094055 or bug 1020135.
 [test_browserElement_oop_Proxy.html]
-skip-if = (toolkit == 'gonk')
 [test_browserElement_oop_PurgeHistory.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_Reload.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_ReloadPostRequest.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_RemoveBrowserElement.html]
 [test_browserElement_oop_ScrollEvent.html]
 [test_browserElement_oop_SecurityChange.html]
-skip-if = toolkit == 'android' || (toolkit == 'gonk' && !debug) #TIMED_OUT, bug 766586
+skip-if = toolkit == 'android' #TIMED_OUT, bug 766586
 [test_browserElement_oop_SendEvent.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_SetInputMethodActive.html]
 # skip-if = (os == "android")
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_SetVisible.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_SetVisibleFrames.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_SetVisibleFrames2.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_Stop.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_TargetBlank.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_oop_TargetTop.html]
 [test_browserElement_oop_Titlechange.html]
 [test_browserElement_oop_TopBarrier.html]
 [test_browserElement_oop_VisibilityChange.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_XFrameOptions.html]
 [test_browserElement_oop_XFrameOptionsAllowFrom.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
@@ -142,12 +126,11 @@ disabled = Disabling some OOP tests for 
 tags = audiochannel
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_AudioChannel_nested.html]
 tags = audiochannel
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_getWebManifest.html]
 disabled = Disabling some OOP tests for WebIDL scope changes
 [test_browserElement_oop_OpenWindowEmpty.html]
-skip-if = (toolkit == 'gonk') # Test doesn't work on B2G emulator
 [test_browserElement_oop_ActiveStateChange.html]
 tags = audiochannel
 disabled = Disabling some OOP tests for WebIDL scope changes
--- a/dom/browser-element/mochitest/mochitest.ini
+++ b/dom/browser-element/mochitest/mochitest.ini
@@ -1,10 +1,10 @@
 [DEFAULT]
-skip-if = (buildapp == 'b2g' && (toolkit != 'gonk' || debug)) || e10s
+skip-if = e10s
 support-files =
   audio.ogg
   ../../../dom/media/test/short-video.ogv
   async.js
   browserElementTestHelpers.js
   browserElement_Alert.js
   browserElement_AlertInFrame.js
   browserElement_Auth.js
@@ -101,75 +101,59 @@ support-files =
 # whether the test should be OOP.  "_oop_" signals OOP, "_inproc_" signals in
 # process.  Default is OOP.
 [test_browserElement_NoAttr.html]
 [test_browserElement_NoPref.html]
 [test_browserElement_NoPermission.html]
 [test_browserElement_inproc_Alert.html]
 [test_browserElement_inproc_Viewmode.html]
 [test_browserElement_inproc_ThemeColor.html]
-skip-if = buildapp == 'b2g'
 [test_browserElement_inproc_AlertInFrame.html]
 [test_browserElement_inproc_Auth.html]
-skip-if = buildapp == 'b2g'
 [test_browserElement_inproc_BrowserWindowNamespace.html]
-skip-if = buildapp == 'b2g'
 [test_browserElement_inproc_BrowserWindowResize.html]
 [test_browserElement_inproc_Close.html]
 [test_browserElement_inproc_CloseFromOpener.html]
-skip-if = buildapp == 'b2g'
 [test_browserElement_inproc_ContextmenuEvents.html]
 [test_browserElement_inproc_CookiesNotThirdParty.html]
 [test_browserElement_inproc_CopyPaste.html]
 subsuite = clipboard
 skip-if = (os == "android") # Disabled on Android, see bug 1230421
 [test_browserElement_inproc_DataURI.html]
 [test_browserElement_inproc_Download.html]
 disabled = bug 1022281
 [test_browserElement_inproc_ExposableURI.html]
 [test_browserElement_inproc_FirstPaint.html]
 [test_browserElement_inproc_ForwardName.html]
 [test_browserElement_inproc_FrameWrongURI.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_inproc_Iconchange.html]
 [test_browserElement_inproc_LoadEvents.html]
 [test_browserElement_inproc_Manifestchange.html]
 [test_browserElement_inproc_Metachange.html]
 [test_browserElement_inproc_OpenNamed.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_inproc_OpenTab.html]
 disabled = won't work as Firefox desktop will intercept ctrl-click
 [test_browserElement_inproc_OpenWindow.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_inproc_OpenWindowDifferentOrigin.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_inproc_OpenWindowInFrame.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_inproc_OpenWindowRejected.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_inproc_Opensearch.html]
 [test_browserElement_inproc_PrivateBrowsing.html]
 [test_browserElement_inproc_PromptCheck.html]
 [test_browserElement_inproc_PromptConfirm.html]
-# Disabled on B2G Emulator because permission cannot be asserted in content process,
-# need to fix either bug 1094055 or bug 1020135.
 [test_browserElement_inproc_Proxy.html]
-skip-if = toolkit == 'gonk' || buildapp == 'mulet'
 [test_browserElement_inproc_RemoveBrowserElement.html]
 [test_browserElement_inproc_ScrollEvent.html]
 [test_browserElement_inproc_SecurityChange.html]
-skip-if = toolkit == 'android' || (toolkit == 'gonk' && !debug) # android(TIMED_OUT, bug 766586) androidx86(TIMED_OUT, bug 766586)
 [test_browserElement_inproc_TargetBlank.html]
-skip-if = (toolkit == 'gonk' && !debug)
 [test_browserElement_inproc_TargetTop.html]
 [test_browserElement_inproc_Titlechange.html]
 [test_browserElement_inproc_TopBarrier.html]
 [test_browserElement_inproc_XFrameOptions.html]
 [test_browserElement_inproc_XFrameOptionsAllowFrom.html]
 [test_browserElement_inproc_XFrameOptionsDeny.html]
 [test_browserElement_inproc_XFrameOptionsSameOrigin.html]
 [test_browserElement_oop_NextPaint.html]
 # Disabled due to https://bugzilla.mozilla.org/show_bug.cgi?id=774100
 disabled = temp disabling some OOP tests for WebIDL scope changes
 [test_browserElement_inproc_Reload.html]
 disabled = bug 774100
 [test_browserElement_inproc_OpenWindowEmpty.html]
-skip-if = (toolkit == 'gonk') # Test doesn't work on B2G emulator