Bug 1829032 - Sort tests in ini files under widget/tests for conforming to the lint rules r=spohl

Differential Revision: https://phabricator.services.mozilla.com/D175973

widget/tests/browser/browser.ini

@@ -8,25 +8,6 @@ skip-if =
   (os == 'linux' && ccov) || tsan # Bug 1613516, the test consistently timeouts on Linux coverage builds.
   os == "win" && bits == 32 && !debug # Bug 1759422
   os == "linux" # Bug 1792749
-[browser_test_ime_state_on_editable_state_change_in_remote_content.js]
-support-files =
-  ../file_ime_state_test_helper.js
-[browser_test_ime_state_on_focus_move_in_remote_content.js]
-support-files =
-  file_ime_state_tests.html
-  ../file_ime_state_test_helper.js
-  ../file_test_ime_state_on_focus_move.js
-[browser_test_ime_state_on_input_type_change_in_remote_content.js]
-skip-if = true # Bug 1817704
-support-files =
-  file_ime_state_tests.html
-  ../file_ime_state_test_helper.js
-  ../file_test_ime_state_on_input_type_change.js
-[browser_test_ime_state_on_readonly_change_in_remote_content.js]
-support-files =
-  file_ime_state_tests.html
-  ../file_ime_state_test_helper.js
-  ../file_test_ime_state_on_readonly_change.js
 [browser_test_ime_state_in_contenteditable_on_focus_move_in_remote_content.js]
 support-files =
   file_ime_state_tests.html
@@ -49,6 +30,25 @@ support-files =
 support-files =
   ../file_ime_state_test_helper.js
   ../file_test_ime_state_in_text_control_on_reframe.js
+[browser_test_ime_state_on_editable_state_change_in_remote_content.js]
+support-files =
+  ../file_ime_state_test_helper.js
+[browser_test_ime_state_on_focus_move_in_remote_content.js]
+support-files =
+  file_ime_state_tests.html
+  ../file_ime_state_test_helper.js
+  ../file_test_ime_state_on_focus_move.js
+[browser_test_ime_state_on_input_type_change_in_remote_content.js]
+skip-if = true # Bug 1817704
+support-files =
+  file_ime_state_tests.html
+  ../file_ime_state_test_helper.js
+  ../file_test_ime_state_on_input_type_change.js
+[browser_test_ime_state_on_readonly_change_in_remote_content.js]
+support-files =
+  file_ime_state_tests.html
+  ../file_ime_state_test_helper.js
+  ../file_test_ime_state_on_readonly_change.js
 [browser_test_scrollbar_colors.js]
 skip-if = (os == 'linux') # bug 1460109
 support-files =

widget/tests/chrome.ini

@@ -4,25 +4,52 @@ support-files =
   empty_window.xhtml
 
 [test_alwaysontop_focus.xhtml]
+
+# Privacy relevant
+[test_bug1123480.xhtml]
+skip-if = os == "win" && bits == 32
+
 [test_bug343416.xhtml]
 skip-if = debug
+[test_bug413277.html]
+skip-if = toolkit != "cocoa" # Cocoa widget test
+[test_bug428405.xhtml]
+skip-if = toolkit != "cocoa" # Cocoa widget test
 [test_bug429954.xhtml]
 support-files = window_bug429954.xhtml
 [test_bug444800.xhtml]
+[test_bug466599.xhtml]
+skip-if = toolkit != "cocoa" # Cocoa widget test
 [test_bug478536.xhtml]
 skip-if = true # Bug 561929
 support-files = window_bug478536.xhtml
+[test_bug485118.xhtml]
+skip-if = toolkit != "cocoa" # Cocoa widget test
 [test_bug517396.xhtml]
 skip-if = (verify && (os == 'win'))
+[test_bug522217.xhtml]
+tags = fullscreen
+skip-if = toolkit != "cocoa" # Cocoa widget test
+support-files = window_bug522217.xhtml
 [test_bug538242.xhtml]
 support-files = window_bug538242.xhtml
 [test_bug565392.html]
 skip-if = toolkit != "windows"
+[test_bug586713.xhtml]
+skip-if = toolkit != "cocoa" # Cocoa widget test
+support-files = bug586713_window.xhtml
 [test_bug593307.xhtml]
 support-files = window_bug593307_offscreen.xhtml window_bug593307_centerscreen.xhtml
-[test_keycodes.xhtml]
-[test_wheeltransaction.xhtml]
-support-files = window_wheeltransaction.xhtml
+[test_bug596600.xhtml]
+support-files = file_bug596600.html
+skip-if = toolkit != "cocoa" # Cocoa widget test
+[test_bug673301.xhtml]
+skip-if = toolkit != "cocoa" # Cocoa widget test
+[test_bug760802.xhtml]
+[test_clipboard.xhtml]
+[test_clipboard_cache.xhtml]
+[test_composition_text_querycontent.xhtml]
+support-files = window_composition_text_querycontent.xhtml
 [test_ime_state_in_contenteditable_on_readonly_change_in_parent.html]
 support-files =
   file_ime_state_test_helper.js
@@ -52,79 +79,53 @@ support-files =
   file_test_ime_state_on_readonly_change.js
 [test_ime_state_others_in_parent.html]
 support-files = window_imestate_iframes.html
-[test_composition_text_querycontent.xhtml]
-support-files = window_composition_text_querycontent.xhtml
 [test_input_events_on_deactive_window.xhtml]
 support-files = file_input_events_on_deactive_window.html
+[test_key_event_counts.xhtml]
+skip-if = toolkit != "cocoa" # Cocoa widget test
+[test_keycodes.xhtml]
+[test_mouse_scroll.xhtml]
+skip-if = toolkit != "windows" # Windows widget test
+support-files =
+  window_mouse_scroll_win.html
+  window_mouse_scroll_win_2.html
+[test_native_key_bindings_mac.html]
+skip-if =
+  toolkit != "cocoa" # Cocoa widget test
+  verify
+[test_native_menus.xhtml]
+skip-if = toolkit != "cocoa" # Cocoa widget test
+support-files = native_menus_window.xhtml
+[test_panel_mouse_coords.xhtml]
+skip-if = toolkit == "windows" # bug 1009955
+[test_platform_colors.xhtml]
+#skip-if = toolkit != "cocoa" # Cocoa widget test
+skip-if = true # Bug 1207190
 [test_position_on_resize.xhtml]
 skip-if =
    verify && (os == 'win')
    (os == "linux" && bits == 64) # Bug 1616760
-[test_sizemode_events.xhtml]
-[test_taskbar_progress.xhtml]
-skip-if = toolkit != "cocoa" && toolkit != "windows" || (os == "win" && os_version == "10.0" && !ccov) # Bug 1456811
-[test_bug760802.xhtml]
-[test_clipboard.xhtml]
-[test_clipboard_cache.xhtml]
-[test_panel_mouse_coords.xhtml]
-skip-if = toolkit == "windows" # bug 1009955
-
-# Cocoa
-[test_native_menus.xhtml]
-skip-if = toolkit != "cocoa"
-support-files = native_menus_window.xhtml
-[test_bug413277.html]
-skip-if = toolkit != "cocoa"
-[test_bug428405.xhtml]
-skip-if = toolkit != "cocoa"
-[test_bug466599.xhtml]
-skip-if = toolkit != "cocoa"
-[test_bug485118.xhtml]
-skip-if = toolkit != "cocoa"
-[test_bug522217.xhtml]
-tags = fullscreen
-skip-if = toolkit != "cocoa"
-support-files = window_bug522217.xhtml
-[test_platform_colors.xhtml]
-#skip-if = toolkit != "cocoa"
-skip-if = true # Bug 1207190
-[test_standalone_native_menu.xhtml]
-skip-if = toolkit != "cocoa"
-support-files = standalone_native_menu_window.xhtml
-[test_bug586713.xhtml]
-skip-if = toolkit != "cocoa"
-support-files = bug586713_window.xhtml
-[test_key_event_counts.xhtml]
-skip-if = toolkit != "cocoa"
-[test_bug596600.xhtml]
-support-files = file_bug596600.html
-skip-if = toolkit != "cocoa"
-[test_bug673301.xhtml]
-skip-if = toolkit != "cocoa"
 [test_secure_input.html]
 support-files = file_secure_input.html
-skip-if = toolkit != "cocoa"
-[test_native_key_bindings_mac.html]
-skip-if = toolkit != "cocoa" || verify
-[test_system_status_bar.xhtml]
-skip-if = toolkit != "cocoa"
-
+skip-if = toolkit != "cocoa" # Cocoa widget test
+[test_sizemode_events.xhtml]
+[test_standalone_native_menu.xhtml]
+skip-if = toolkit != "cocoa" # Cocoa widget test
+support-files = standalone_native_menu_window.xhtml
 [test_system_font_changes.xhtml]
 support-files = system_font_changes.xhtml
 run-if = toolkit == 'gtk' # Currently the test works on only gtk3
+[test_system_status_bar.xhtml]
+skip-if = toolkit != "cocoa" # Cocoa widget test
+[test_taskbar_progress.xhtml]
+skip-if =
+  toolkit != "cocoa" && toolkit != "windows"
+  (os == "win" && os_version == "10.0" && !ccov) # Bug 1456811
+[test_transferable_overflow.xhtml]
+skip-if = (verify && (os == 'mac' || os == 'linux'))
+[test_wheeltransaction.xhtml]
+support-files = window_wheeltransaction.xhtml
 
 # Windows
 # taskbar_previews.xhtml
 # window_state_windows.xhtml
-[test_mouse_scroll.xhtml]
-skip-if = toolkit != "windows"
-support-files =
-  window_mouse_scroll_win.html
-  window_mouse_scroll_win_2.html
-
-# Privacy relevant
-[test_bug1123480.xhtml]
-skip-if = os == "win" && bits == 32
-[test_transferable_overflow.xhtml]
-skip-if = (verify && (os == 'mac' || os == 'linux'))
-

widget/tests/mochitest.ini

@@ -3,10 +3,16 @@ prefs =
   dom.forms.enterkeyhint=true # only for test_actionhint.html
 
 [test_AltGr_key_events_in_web_content_on_windows.html]
-skip-if = toolkit != 'windows' || headless # headless: Bug 1410525
+skip-if =
+  toolkit != 'windows' # Windows widget test
+  headless # bug 1410525
 [test_actionhint.html]
 [test_assign_event_data.html]
-skip-if = toolkit == "cocoa" || (toolkit == 'android' && debug) || android_version == '24' || (headless && os == "win") # Mac: Bug 933303, Android bug 1285414
+skip-if =
+  toolkit == "cocoa" # bug 933303
+  (toolkit == 'android' && debug) # bug 1285414
+  android_version == '24'
+  (headless && os == "win")
 [test_autocapitalize.html]
 [test_keypress_event_with_alt_on_mac.html]
 skip-if = toolkit != "cocoa"
@@ -14,6 +20,8 @@ skip-if = toolkit != "cocoa"
 skip-if = toolkit != "cocoa"
 support-files = !/gfx/layers/apz/test/mochitest/apz_test_utils.js
 [test_picker_no_crash.html]
-skip-if = asan || debug # bug 1267491
+skip-if =
+  asan
+  debug # bug 1267491
 support-files = window_picker_no_crash_child.html
 [test_textScaleFactor_system_font.html]