Bug 1392787 - Disable manifestparser tests using 'disabled' key instead of comment, r=jmaher
☠☠ backed out by 6cc7f7a8ebdd ☠ ☠
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Tue, 22 Aug 2017 16:56:02 -0400
changeset 376655 e774700fe07014aa47e62d8de0240855ba69c255
parent 376654 2ce8a387fa80ac5ba6781505f206dd8de4cd217f
child 376656 88dfc4e305fbda7365deaf65ba6ce764ac010617
push id49573
push userahalberstadt@mozilla.com
push dateThu, 24 Aug 2017 19:08:03 +0000
treeherderautoland@e774700fe070 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1392787
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1392787 - Disable manifestparser tests using 'disabled' key instead of comment, r=jmaher MozReview-Commit-ID: IQL7hWxQX9F
browser/components/customizableui/test/browser.ini
devtools/client/framework/test/browser.ini
devtools/client/inspector/boxmodel/test/browser.ini
devtools/client/performance/test/browser.ini
devtools/client/scratchpad/test/browser.ini
devtools/client/webaudioeditor/test/browser.ini
devtools/server/tests/browser/browser.ini
dom/canvas/test/webgl-mochitest/mochitest.ini
dom/media/tests/mochitest/mochitest.ini
dom/smil/test/mochitest.ini
mobile/android/tests/browser/robocop/robocop.ini
security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini
testing/mochitest/tests/MochiKit-1.4.2/tests/mochitest.ini
--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@@ -36,18 +36,18 @@ skip-if = os == "linux"
 
 [browser_914138_widget_API_overflowable_toolbar.js]
 skip-if = os == "linux"
 
 [browser_918049_skipintoolbarset_dnd.js]
 [browser_923857_customize_mode_event_wrapping_during_reset.js]
 [browser_927717_customize_drag_empty_toolbar.js]
 
-# Bug 1163231 - Causes failures on Developer Edition on Windows 7.
-# [browser_932928_show_notice_when_palette_empty.js]
+[browser_932928_show_notice_when_palette_empty.js]
+disabled=Bug 1163231 - Fails on all platforms
 
 [browser_934113_menubar_removable.js]
 # Because this test is about the menubar, it can't be run on mac
 skip-if = os == "mac"
 
 [browser_934951_zoom_in_toolbar.js]
 [browser_938980_navbar_collapsed.js]
 [browser_938995_indefaultstate_nonremovable.js]
--- a/devtools/client/framework/test/browser.ini
+++ b/devtools/client/framework/test/browser.ini
@@ -82,18 +82,18 @@ skip-if = os == "mac" # Full keyboard na
 [browser_toolbox_minimize.js]
 skip-if = true # Bug 1177463 - Temporarily hide the minimize button
 [browser_toolbox_options.js]
 [browser_toolbox_options_disable_buttons.js]
 [browser_toolbox_options_disable_cache-01.js]
 [browser_toolbox_options_disable_cache-02.js]
 [browser_toolbox_options_disable_js.js]
 [browser_toolbox_options_enable_serviceworkers_testing.js]
-# [browser_toolbox_raise.js] # Bug 962258
-# skip-if = os == "win"
+[browser_toolbox_raise.js]
+disabled=Bug 962258
 [browser_toolbox_races.js]
 [browser_toolbox_ready.js]
 [browser_toolbox_remoteness_change.js]
 run-if = e10s
 [browser_toolbox_select_event.js]
 skip-if = e10s # Bug 1069044 - destroyInspector may hang during shutdown
 [browser_toolbox_selected_tool_unavailable.js]
 [browser_toolbox_selectionchanged_event.js]
--- a/devtools/client/inspector/boxmodel/test/browser.ini
+++ b/devtools/client/inspector/boxmodel/test/browser.ini
@@ -10,18 +10,18 @@ support-files =
   !/devtools/client/inspector/test/head.js
   !/devtools/client/inspector/test/shared-head.js
   !/devtools/client/shared/test/test-actor.js
   !/devtools/client/shared/test/test-actor-registry.js
 
 [browser_boxmodel.js]
 [browser_boxmodel_computed-accordion-state.js]
 [browser_boxmodel_editablemodel.js]
-# [browser_boxmodel_editablemodel_allproperties.js]
-# Disabled for too many intermittent failures (bug 1009322)
+[browser_boxmodel_editablemodel_allproperties.js]
+disabled=too many intermittent failures (bug 1009322)
 [browser_boxmodel_editablemodel_bluronclick.js]
 [browser_boxmodel_editablemodel_border.js]
 [browser_boxmodel_editablemodel_pseudo.js]
 [browser_boxmodel_editablemodel_stylerules.js]
 [browser_boxmodel_guides.js]
 [browser_boxmodel_layout-accordion-state.js]
 [browser_boxmodel_navigation.js]
 [browser_boxmodel_offsetparent.js]
@@ -29,10 +29,10 @@ support-files =
 [browser_boxmodel_properties.js]
 [browser_boxmodel_pseudo-element.js]
 [browser_boxmodel_rotate-labels-on-sides.js]
 [browser_boxmodel_sync.js]
 [browser_boxmodel_tooltips.js]
 skip-if = true # Bug 1336198
 [browser_boxmodel_update-after-navigation.js]
 [browser_boxmodel_update-after-reload.js]
-# [browser_boxmodel_update-in-iframes.js]
-# Bug 1020038 boxmodel-view updates for iframe elements changes
+[browser_boxmodel_update-in-iframes.js]
+disabled=Bug 1020038 boxmodel-view updates for iframe elements changes
--- a/devtools/client/performance/test/browser.ini
+++ b/devtools/client/performance/test/browser.ini
@@ -28,27 +28,27 @@ support-files =
 [browser_perf-console-record-09.js]
 [browser_perf-details-01-toggle.js]
 [browser_perf-details-02-utility-fun.js]
 [browser_perf-details-03-without-allocations.js]
 [browser_perf-details-04-toolbar-buttons.js]
 [browser_perf-details-05-preserve-view.js]
 [browser_perf-details-06-rerender-on-selection.js]
 [browser_perf-details-07-bleed-events.js]
-# [browser_perf-details-gc-snap.js] TODO bug 1256350
 [browser_perf-details-render-00-waterfall.js]
 [browser_perf-details-render-01-js-calltree.js]
 [browser_perf-details-render-02-js-flamegraph.js]
 [browser_perf-details-render-03-memory-calltree.js]
 [browser_perf-details-render-04-memory-flamegraph.js]
 [browser_perf-docload.js]
 [browser_perf-highlighted.js]
 [browser_perf-loading-01.js]
 [browser_perf-loading-02.js]
-# [browser_perf-marker-details.js] TODO bug 1256350
+[browser_perf-marker-details.js]
+disabled=TODO bug 1256350
 [browser_perf-options-01-toggle-throw.js]
 [browser_perf-options-02-toggle-throw-alt.js]
 [browser_perf-options-03-toggle-meta.js]
 [browser_perf-options-enable-framerate-01.js]
 [browser_perf-options-enable-framerate-02.js]
 [browser_perf-options-enable-memory-01.js]
 [browser_perf-options-enable-memory-02.js]
 [browser_perf-options-flatten-tree-recursion-01.js]
@@ -56,70 +56,85 @@ support-files =
 [browser_perf-options-invert-call-tree-01.js]
 [browser_perf-options-invert-call-tree-02.js]
 [browser_perf-options-invert-flame-graph-01.js]
 [browser_perf-options-invert-flame-graph-02.js]
 [browser_perf-options-propagate-allocations.js]
 [browser_perf-options-propagate-profiler.js]
 [browser_perf-options-show-idle-blocks-01.js]
 [browser_perf-options-show-idle-blocks-02.js]
-# [browser_perf-options-show-jit-optimizations.js] TODO bug 1256350
+[browser_perf-options-show-jit-optimizations.js]
+disabled=TODO bug 1256350
 [browser_perf-options-show-platform-data-01.js]
 [browser_perf-options-show-platform-data-02.js]
 [browser_perf-overview-render-01.js]
 [browser_perf-overview-render-02.js]
 [browser_perf-overview-render-03.js]
 [browser_perf-overview-render-04.js]
 [browser_perf-overview-selection-01.js]
 [browser_perf-overview-selection-02.js]
 [browser_perf-overview-selection-03.js]
 [browser_perf-overview-time-interval.js]
-# [browser_perf-private-browsing.js] TODO bug 1256350
+[browser_perf-private-browsing.js]
+disabled=TODO bug 1256350
 [browser_perf-range-changed-render.js]
 [browser_perf-recording-notices-01.js]
 [browser_perf-recording-notices-02.js]
 [browser_perf-recording-notices-03.js]
 skip-if = debug && (bits == 32) # bug 1273374
 [browser_perf-recording-notices-04.js]
 [browser_perf-recording-notices-05.js]
 [browser_perf-recording-selected-01.js]
 [browser_perf-recording-selected-02.js]
 [browser_perf-recording-selected-03.js]
 [browser_perf-recording-selected-04.js]
 [browser_perf-recordings-clear-01.js]
 [browser_perf-recordings-clear-02.js]
-# [browser_perf-recordings-io-01.js] TODO bug 1256350
-# [browser_perf-recordings-io-02.js] TODO bug 1256350
-# [browser_perf-recordings-io-03.js] TODO bug 1256350
-# [browser_perf-recordings-io-04.js] TODO bug 1256350
-# [browser_perf-recordings-io-05.js] TODO bug 1256350
-# [browser_perf-recordings-io-06.js] TODO bug 1256350
+[browser_perf-recordings-io-01.js]
+disabled=TODO bug 1256350
+[browser_perf-recordings-io-02.js]
+disabled=TODO bug 1256350
+[browser_perf-recordings-io-03.js]
+disabled=TODO bug 1256350
+[browser_perf-recordings-io-04.js]
+disabled=TODO bug 1256350
+[browser_perf-recordings-io-05.js]
+disabled=TODO bug 1256350
+[browser_perf-recordings-io-06.js]
+disabled=TODO bug 1256350
 [browser_perf-refresh.js]
 [browser_perf-states.js]
 [browser_perf-telemetry-01.js]
 [browser_perf-telemetry-02.js]
 [browser_perf-telemetry-03.js]
 [browser_perf-telemetry-04.js]
-# [browser_perf-theme-toggle.js] TODO bug 1256350
+[browser_perf-theme-toggle.js]
+disabled=TODO bug 1256350
 [browser_perf-tree-abstract-01.js]
 [browser_perf-tree-abstract-02.js]
 [browser_perf-tree-abstract-03.js]
 [browser_perf-tree-abstract-04.js]
 [browser_perf-tree-abstract-05.js]
 [browser_perf-tree-view-01.js]
 [browser_perf-tree-view-02.js]
 [browser_perf-tree-view-03.js]
 [browser_perf-tree-view-04.js]
 [browser_perf-tree-view-05.js]
 [browser_perf-tree-view-06.js]
 [browser_perf-tree-view-07.js]
 [browser_perf-tree-view-08.js]
 [browser_perf-tree-view-09.js]
 [browser_perf-tree-view-10.js]
-# [browser_perf-tree-view-11.js] TODO bug 1256350
+[browser_perf-tree-view-11.js]
+disabled=TODO bug 1256350
 [browser_perf-ui-recording.js]
-# [browser_timeline-filters-01.js] TODO bug 1256350
-# [browser_timeline-filters-02.js] TODO bug 1256350
+[browser_timeline-filters-01.js]
+disabled=TODO bug 1256350
+[browser_timeline-filters-02.js]
+disabled=TODO bug 1256350
 [browser_timeline-waterfall-background.js]
 [browser_timeline-waterfall-generic.js]
-# [browser_timeline-waterfall-rerender.js] TODO bug 1256350
-# [browser_timeline-waterfall-sidebar.js] TODO bug 1256350
-# [browser_timeline-waterfall-workers.js] TODO bug 1256350
+[browser_timeline-waterfall-rerender.js]
+disabled=TODO bug 1256350
+[browser_timeline-waterfall-sidebar.js]
+disabled=TODO bug 1256350
+[browser_timeline-waterfall-workers.js]
+disabled=TODO bug 1256350
--- a/devtools/client/scratchpad/test/browser.ini
+++ b/devtools/client/scratchpad/test/browser.ini
@@ -10,18 +10,18 @@ support-files = head.js
 [browser_scratchpad_eval_func.js]
 [browser_scratchpad_goto_line_ui.js]
 [browser_scratchpad_reload_and_run.js]
 [browser_scratchpad_display_non_error_exceptions.js]
 [browser_scratchpad_modeline.js]
 [browser_scratchpad_chrome_context_pref.js]
 [browser_scratchpad_help_key.js]
 [browser_scratchpad_recent_files.js]
-# [browser_scratchpad_confirm_close.js]
-# Disable test due to bug 807234 becoming basically permanent
+[browser_scratchpad_confirm_close.js]
+disabled=bug 807234 becoming basically permanent
 [browser_scratchpad_sessions.js]
 [browser_scratchpad_tab.js]
 [browser_scratchpad_wrong_window_focus.js]
 [browser_scratchpad_unsaved.js]
 [browser_scratchpad_falsy.js]
 [browser_scratchpad_edit_ui_updates.js]
 [browser_scratchpad_revert_to_saved.js]
 [browser_scratchpad_run_error_goto_line.js]
--- a/devtools/client/webaudioeditor/test/browser.ini
+++ b/devtools/client/webaudioeditor/test/browser.ini
@@ -25,29 +25,36 @@ support-files =
 [browser_audionode-actor-get-set-param.js]
 [browser_audionode-actor-type.js]
 [browser_audionode-actor-source.js]
 [browser_audionode-actor-bypass.js]
 [browser_audionode-actor-bypassable.js]
 [browser_audionode-actor-connectnode-disconnect.js]
 [browser_audionode-actor-connectparam.js]
 skip-if = true # bug 1092571
-# [browser_audionode-actor-add-automation-event.js] bug 1134036
-# [browser_audionode-actor-get-automation-data-01.js] bug 1134036
-# [browser_audionode-actor-get-automation-data-02.js] bug 1134036
-# [browser_audionode-actor-get-automation-data-03.js] bug 1134036
+[browser_audionode-actor-add-automation-event.js]
+disabled=bug 1134036
+[browser_audionode-actor-get-automation-data-01.js]
+disabled=bug 1134036
+[browser_audionode-actor-get-automation-data-02.js]
+disabled=bug 1134036
+[browser_audionode-actor-get-automation-data-03.js]
+disabled=bug 1134036
 [browser_callwatcher-01.js]
 [browser_callwatcher-02.js]
 [browser_webaudio-actor-simple.js]
 [browser_webaudio-actor-destroy-node.js]
 [browser_webaudio-actor-connect-param.js]
-# [browser_webaudio-actor-automation-event.js] bug 1134036
+[browser_webaudio-actor-automation-event.js]
+disabled=bug 1134036
 
-# [browser_wa_automation-view-01.js] bug 1134036
-# [browser_wa_automation-view-02.js] bug 1134036
+[browser_wa_automation-view-01.js]
+disabled=bug 1134036
+[browser_wa_automation-view-02.js]
+disabled=bug 1134036
 [browser_wa_controller-01.js]
 [browser_wa_destroy-node-01.js]
 [browser_wa_first-run.js]
 [browser_wa_graph-click.js]
 [browser_wa_graph-markers.js]
 [browser_wa_graph-render-01.js]
 [browser_wa_graph-render-02.js]
 [browser_wa_graph-render-03.js]
--- a/devtools/server/tests/browser/browser.ini
+++ b/devtools/server/tests/browser/browser.ini
@@ -76,19 +76,16 @@ skip-if = true # Needs to be updated for
 skip-if = true # Needs to be updated for async actor destruction
 [browser_perf-realtime-markers.js]
 [browser_perf-recording-actor-01.js]
 skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-recording-actor-02.js]
 skip-if = e10s # Bug 1183605 - devtools/server/tests/browser/ tests are still disabled in E10S
 [browser_perf-samples-01.js]
 [browser_perf-samples-02.js]
-#[browser_perf-front-profiler-01.js] bug 1077464
-#[browser_perf-front-profiler-05.js] bug 1077464
-#[browser_perf-front-profiler-06.js]
 [browser_storage_cookies-duplicate-names.js]
 [browser_storage_dynamic_windows.js]
 [browser_storage_listings.js]
 [browser_storage_updates.js]
 [browser_stylesheets_getTextEmpty.js]
 [browser_stylesheets_nested-iframes.js]
 [browser_timeline.js]
 [browser_timeline_actors.js]
--- a/dom/canvas/test/webgl-mochitest/mochitest.ini
+++ b/dom/canvas/test/webgl-mochitest/mochitest.ini
@@ -76,18 +76,18 @@ skip-if = android_version == '18' #Andro
 [test_noprog_draw.html]
 [test_pixel_pack_buffer.html]
 [test_privileged_exts.html]
 [test_renderer_strings.html]
 [test_sab_with_webgl.html]
 [test_texsubimage_float.html]
 [test_uninit_data.html]
 [test_webgl_available.html]
-#[test_webgl_color_buffer_float.html]
-# We haven't cleaned up the Try results yet, but let's get this on the books first.
+[test_webgl_color_buffer_float.html]
+disabled=We haven't cleaned up the Try results yet, but let's get this on the books first.
 [test_webgl_conformance.html]
 skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [test_webgl_compressed_texture_es3.html]
 [test_webgl_disjoint_timer_query.html]
 [test_webgl_force_enable.html]
 [test_webgl_request_context.html]
 skip-if = toolkit == 'android' #bug 865443- seperate suite - the non_conf* tests pass except for one on armv6 tests
 [test_webgl_request_mismatch.html]
--- a/dom/media/tests/mochitest/mochitest.ini
+++ b/dom/media/tests/mochitest/mochitest.ini
@@ -144,17 +144,18 @@ skip-if = toolkit == 'android' # android
 [test_peerConnection_captureStream_canvas_2d.html]
 skip-if = android_version == '18' # android(Bug 1319019, timeouts on 4.3 emulator)
 [test_peerConnection_captureStream_canvas_2d_noSSRC.html]
 skip-if = android_version == '18' # android(Bug 1319019, timeouts on 4.3 emulator)
 [test_peerConnection_multiple_captureStream_canvas_2d.html]
 skip-if = (android_version == '18' && debug) # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_captureStream_canvas_webgl.html]
 skip-if = (android_version <= '17' || android_version == '18') # (<17: bug 1346630, 18: bug 1385950)
-# [test_peerConnection_certificates.html] # bug 1180968
+[test_peerConnection_certificates.html]
+disabled=bug 1180968
 [test_peerConnection_close.html]
 [test_peerConnection_closeDuringIce.html]
 [test_peerConnection_constructedStream.html]
 skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_errorCallbacks.html]
 [test_peerConnection_iceFailure.html]
 skip-if = os == 'linux' || os == 'mac' || os == 'win' || toolkit == 'android' # (Bug 1180388 for win, mac and linux), android(Bug 1189784, timeouts on 4.3 emulator), Bug 1180388
 [test_peerConnection_insertDTMF.html]
@@ -189,17 +190,18 @@ skip-if = toolkit == 'android'
 [test_peerConnection_restartIceLocalAndRemoteRollback.html]
 skip-if = toolkit == 'android'
 [test_peerConnection_scaleResolution.html]
 skip-if = (android_version == '18') # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_simulcastOffer.html]
 skip-if = android_version # no simulcast support on android
 [test_peerConnection_simulcastAnswer.html]
 skip-if = android_version # no simulcast support on android
-#[test_peerConnection_relayOnly.html]
+[test_peerConnection_relayOnly.html]
+disabled=
 [test_peerConnection_callbacks.html]
 skip-if = toolkit == 'android' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_replaceTrack.html]
 skip-if = toolkit == 'android'  # Bug 1189784
 [test_peerConnection_syncSetDescription.html]
 skip-if = android_version == '18' # android(Bug 1189784, timeouts on 4.3 emulator)
 [test_peerConnection_setLocalAnswerInHaveLocalOffer.html]
 [test_peerConnection_setLocalAnswerInStable.html]
--- a/dom/smil/test/mochitest.ini
+++ b/dom/smil/test/mochitest.ini
@@ -17,18 +17,18 @@ support-files =
 [test_smilAnimateMotionInvalidValues.xhtml]
 [test_smilAnimateMotionOverrideRules.xhtml]
 [test_smilBackwardsSeeking.xhtml]
 [test_smilCSSFontStretchRelative.xhtml]
 [test_smilCSSFromBy.xhtml]
 skip-if = stylo
 [test_smilCSSFromTo.xhtml]
 skip-if = stylo
-# [test_smilCSSInherit.xhtml]
-# disabled until bug 501183 is fixed
+[test_smilCSSInherit.xhtml]
+disabled=until bug 501183 is fixed
 [test_smilCSSInvalidValues.xhtml]
 [test_smilCSSPaced.xhtml]
 skip-if = stylo
 [test_smilChangeAfterFrozen.xhtml]
 skip-if = stylo
 [test_smilConditionalProcessing.html]
 [test_smilContainerBinding.xhtml]
 [test_smilCrossContainer.xhtml]
--- a/mobile/android/tests/browser/robocop/robocop.ini
+++ b/mobile/android/tests/browser/robocop/robocop.ini
@@ -10,70 +10,80 @@ skip-if = android_version == "18"
 [src/org/mozilla/gecko/tests/testAddSearchEngine.java]
 # disabled on 4.3, bug 1120759
 skip-if = android_version == "18"
 [src/org/mozilla/gecko/tests/testANRReporter.java]
 [src/org/mozilla/gecko/tests/testAudioFocus.java]
 [src/org/mozilla/gecko/tests/testMediaControl.java]
 skip-if = android_version < "23"
 [src/org/mozilla/gecko/tests/testAxisLocking.java]
-# [src/org/mozilla/gecko/tests/testBookmark.java] # see bug 915350
+[src/org/mozilla/gecko/tests/testBookmark.java]
+disabled=see bug 915350
 [src/org/mozilla/gecko/tests/testBookmarksPanel.java]
 # disabled on 4.3, bug 987930
 skip-if = android_version == "18"
 [src/org/mozilla/gecko/tests/testBookmarkFolders.java]
 # disabled on 4.3, bug 1144921
 skip-if = android_version == "18"
 [src/org/mozilla/gecko/tests/testBookmarklets.java]
-# [src/org/mozilla/gecko/tests/testBookmarkKeyword.java] # see bug 915350
+[src/org/mozilla/gecko/tests/testBookmarkKeyword.java]
+disabled=see bug 915350
 [src/org/mozilla/gecko/tests/testBrowserProvider.java]
 [src/org/mozilla/gecko/tests/testBrowserSearchVisibility.java]
 [src/org/mozilla/gecko/tests/testDBUtils.java]
 [src/org/mozilla/gecko/tests/testDistribution.java]
 [src/org/mozilla/gecko/tests/testDoorHanger.java]
 # disabled on 4.3, bug 1144924
 skip-if = android_version == "18"
 [src/org/mozilla/gecko/tests/testFilterOpenTab.java]
-# [src/org/mozilla/gecko/tests/testFindInPage.java] # bug 1128287
+[src/org/mozilla/gecko/tests/testFindInPage.java]
+disabled=bug 1128287
 [src/org/mozilla/gecko/tests/testFlingCorrectness.java]
 skip-if = true # Bug 1390059
 [src/org/mozilla/gecko/tests/testFormHistory.java]
 [src/org/mozilla/gecko/tests/testGetUserMedia.java]
 # failures across the board, bug 1092202 & bug 1144926
 skip-if = true
-# [src/org/mozilla/gecko/tests/testHistory.java] # see bug 915350
+[src/org/mozilla/gecko/tests/testHistory.java]
+disabled=see bug 915350
 [src/org/mozilla/gecko/tests/testHomeBanner.java]
 [src/org/mozilla/gecko/tests/testInputUrlBar.java]
 [src/org/mozilla/gecko/tests/testJarReader.java]
 [src/org/mozilla/gecko/tests/testLinkContextMenu.java]
-# [src/org/mozilla/gecko/tests/testHomeListsProvider.java] # see bug 952310
+[src/org/mozilla/gecko/tests/testHomeListsProvider.java]
+disabled=see bug 952310
 [src/org/mozilla/gecko/tests/testLoad.java]
 [src/org/mozilla/gecko/tests/testMailToContextMenu.java]
 [src/org/mozilla/gecko/tests/testNewTab.java]
 [src/org/mozilla/gecko/tests/testPanCorrectness.java]
-# [src/org/mozilla/gecko/tests/testPasswordEncrypt.java] # see bug 824067
+[src/org/mozilla/gecko/tests/testPasswordEncrypt.java]
+disabled=see bug 824067
 [src/org/mozilla/gecko/tests/testPasswordProvider.java]
-# [src/org/mozilla/gecko/tests/testPermissions.java] # see bug 757475
+[src/org/mozilla/gecko/tests/testPermissions.java]
+disabled=see bug 757475
 [src/org/mozilla/gecko/tests/testPictureLinkContextMenu.java]
 [src/org/mozilla/gecko/tests/testPrefsObserver.java]
 [src/org/mozilla/gecko/tests/testPrivateBrowsing.java]
 [src/org/mozilla/gecko/tests/testPromptGridInput.java]
 # bug 1001657
 skip-if = android_version == "18"
 [src/org/mozilla/gecko/tests/testSearchHistoryProvider.java]
 [src/org/mozilla/gecko/tests/testSearchSuggestions.java]
 # disabled on 4.3, bug 1145867
 skip-if = android_version == "18"
 [src/org/mozilla/gecko/tests/testSessionFilePreservation.java]
 [src/org/mozilla/gecko/tests/testSessionOOMSave.java]
 [src/org/mozilla/gecko/tests/testSessionOOMRestore.java]
 [src/org/mozilla/gecko/tests/testSettingsPages.java]
-# [src/org/mozilla/gecko/tests/testShareLink.java] # see bug 915897
-# [src/org/mozilla/gecko/tests/testThumbnails.java] # see bug 813107
-# [src/org/mozilla/gecko/tests/testVkbOverlap.java] # see bug 907274
+[src/org/mozilla/gecko/tests/testShareLink.java]
+disabled=see bug 915897
+[src/org/mozilla/gecko/tests/testThumbnails.java]
+disabled=see bug 813107
+[src/org/mozilla/gecko/tests/testVkbOverlap.java]
+disabled=see bug 907274
 
 # Using JavascriptTest
 # (If your test can be written entirely in Javascript, consider writing
 # it as a chrome test instead. See mobile/android/tests/browser/chrome.)
 [src/org/mozilla/gecko/tests/testBrowserDiscovery.java]
 [src/org/mozilla/gecko/tests/testFilePicker.java]
 [src/org/mozilla/gecko/tests/testHistoryService.java]
 [src/org/mozilla/gecko/tests/testOSLocale.java]
@@ -86,17 +96,18 @@ skip-if = android_version == "18"
 [src/org/mozilla/gecko/tests/testUITelemetry.java]
 [src/org/mozilla/gecko/tests/testBug1217581.java]
 [src/org/mozilla/gecko/tests/testVideoControls.java]
 # disabled on 4.3, bug 1098532
 skip-if = android_version == "18"
 [src/org/mozilla/gecko/tests/testAndroidCastDeviceProvider.java]
 
 # Using UITest
-#[src/org/mozilla/gecko/tests/testAboutHomePageNavigation.java] # see bug 947550, bug 979038 and bug 977952
+[src/org/mozilla/gecko/tests/testAboutHomePageNavigation.java]
+disabled=see bug 947550, bug 979038 and bug 977952
 [src/org/mozilla/gecko/tests/testAboutHomeVisibility.java]
 [src/org/mozilla/gecko/tests/testAppMenuPathways.java]
 [src/org/mozilla/gecko/tests/testBackButtonInEditMode.java]
 [src/org/mozilla/gecko/tests/testBrowserDatabaseHelperUpgrades.java]
 [src/org/mozilla/gecko/tests/testEventDispatcher.java]
 [src/org/mozilla/gecko/tests/testInputConnection.java]
 [src/org/mozilla/gecko/tests/testJavascriptBridge.java]
 [src/org/mozilla/gecko/tests/testReaderCacheMigration.java]
--- a/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini
+++ b/security/manager/ssl/tests/mochitest/mixedcontent/mochitest.ini
@@ -37,26 +37,26 @@ support-files =
 [test_documentWrite1.html]
 [test_documentWrite2.html]
 [test_dynDelayedUnsecurePicture.html]
 [test_dynDelayedUnsecureXHR.html]
 [test_dynUnsecureBackground.html]
 [test_dynUnsecureIframeRedirect.html]
 [test_dynUnsecurePicture.html]
 [test_dynUnsecurePicturePreload.html]
-# [test_dynUnsecureRedirect.html]
-# intermitently fails, quite often, bug 487402
+[test_dynUnsecureRedirect.html]
+disabled=intermitently fails, quite often, bug 487402
 [test_innerHtmlDelayedUnsecurePicture.html]
 [test_innerHtmlUnsecurePicture.html]
 [test_javascriptPicture.html]
 [test_secureAll.html]
 [test_securePicture.html]
 [test_unsecureBackground.html]
 [test_unsecureCSS.html]
 [test_unsecureIframe.html]
 [test_unsecureIframe2.html]
-# [test_unsecureIframeMetaRedirect.html]
-# intermittently fails, less often, bug 487632
+[test_unsecureIframeMetaRedirect.html]
+disabled=intermittently fails, less often, bug 487632
 [test_unsecureIframeRedirect.html]
 [test_unsecurePicture.html]
 [test_unsecurePictureDup.html]
 [test_unsecurePictureInIframe.html]
 [test_unsecureRedirect.html]
--- a/testing/mochitest/tests/MochiKit-1.4.2/tests/mochitest.ini
+++ b/testing/mochitest/tests/MochiKit-1.4.2/tests/mochitest.ini
@@ -22,11 +22,10 @@ skip-if = (android_version == '18' && de
 [test_MochiKit-Format.html]
 [test_MochiKit-Iter.html]
 [test_MochiKit-Logging.html]
 [test_MochiKit-MochiKit.html]
 [test_MochiKit-Selector.html]
 [test_MochiKit-Signal.html]
 [test_MochiKit-Style.html]
 [test_MochiKit-Visual.html]
-# This test is broken: "Error: JSAN is not defined ... Line: 10".
-# (And is removed in future MochiKit v1.5)
-#[test_MochiKit-JSAN.html]
+[test_MochiKit-JSAN.html]
+disabled=This test is broken: "Error: JSAN is not defined ... Line: 10" (And is removed in future MochiKit v1.5)