Bug 1709526 - Fix all the lint errors for .ini files in dom/ r=jmaher

Differential Revision: https://phabricator.services.mozilla.com/D114321
2021-05-06 01:29:31 +00:00 · 2021-05-06 01:29:31 +00:00 · 6191ca4916
--- a/dom/base/test/browser.ini
+++ b/dom/base/test/browser.ini
@ -47,10 +47,13 @@ tags = mcb
 [browser_bug1011748.js]
 [browser_bug1058164.js]
 [browser_force_process_selector.js]
-skip-if = !e10s || verify || (os == 'win' && os_version == '10.0' && bits == 64 && asan) || (os == "linux" && bits == 64 && os_version == "18.04" && asan) # this only makes sense with e10s-multi , Bug 1651357
+skip-if = !e10s
+  verify
+  (os == 'win' && os_version == '10.0' && bits == 64 && asan)
+  (os == "linux" && bits == 64 && os_version == "18.04" && asan) # this only makes sense with e10s-multi , Bug 1651357
 [browser_messagemanager_loadprocessscript.js]
 [browser_aboutnewtab_process_selection.js]
-skip-if = 
+skip-if =
  !e10s # this only makes sense with e10s-multi
  os == 'linux' && bits == 64 #Bug 1618098
 [browser_messagemanager_targetframeloader.js]
--- a/dom/base/test/mochitest.ini
+++ b/dom/base/test/mochitest.ini
@ -617,9 +617,11 @@ support-files =
 [test_content_iterator_pre_order.html]
 [test_content_iterator_subtree.html]
 [test_copyimage.html]
-skip-if = toolkit == 'android' || headless #bug 904183
+skip-if = toolkit == 'android'
+  headless #bug 904183
 [test_copypaste.html]
-skip-if = toolkit == 'android' || headless #bug 904183
+skip-if = toolkit == 'android'
+  headless #bug 904183
 [test_copypaste.xhtml]
 skip-if = headless  #bug 904183
 [test_copypaste_disabled.html]
--- a/dom/cache/test/mochitest/mochitest.ini
+++ b/dom/cache/test/mochitest/mochitest.ini
@ -46,7 +46,8 @@ support-files =
 [test_cache_orphaned_body.html]
 scheme=https
 [test_cache_padding.html]
-skip-if = verify || os == 'android' # bug 1468434 for android
+skip-if = verify
+  os == 'android' # bug 1468434 for android
 [test_cache_untrusted.html]
 [test_cache_updateUsage.html]
 [test_chrome_constructor.html]
--- a/dom/canvas/test/mochitest.ini
+++ b/dom/canvas/test/mochitest.ini
@ -104,15 +104,20 @@ disabled = bug 512647
 # imprecision that results in errors here. SkiaGL (on Android) also has
 # a similar problem.
 [test_2d.gradient.radial.inside2.html]
-skip-if = toolkit == 'cocoa' || toolkit == 'android'
+skip-if = toolkit == 'cocoa'
+  toolkit == 'android'
 [test_2d.gradient.radial.inside3.html]
-skip-if = toolkit == 'cocoa' || toolkit == 'android'
+skip-if = toolkit == 'cocoa'
+  toolkit == 'android'
 [test_2d.gradient.radial.outside1.html]
-skip-if = toolkit == 'cocoa' || toolkit == 'android'
+skip-if = toolkit == 'cocoa'
+  toolkit == 'android'
 [test_2d.gradient.radial.cone.front.html]
-skip-if = toolkit == 'cocoa' || toolkit == 'android'
+skip-if = toolkit == 'cocoa'
+  toolkit == 'android'
 [test_2d.gradient.radial.cone.top.html]
-skip-if = toolkit == 'cocoa' || toolkit == 'android'
+skip-if = toolkit == 'cocoa'
+  toolkit == 'android'
 # Tests that fail on non-Mac (bug 407107)
 [test_2d.gradient.radial.outside2.html]
 skip-if = toolkit != 'cocoa'
--- a/dom/events/test/mochitest.ini
+++ b/dom/events/test/mochitest.ini
@ -45,7 +45,8 @@ support-files = test_bug336682.js
 [test_bug402089.html]
 [test_bug405632.html]
 [test_bug409604.html]
-skip-if = xorigin || toolkit == 'android' # xorigin: Bug 1682519, android: TIMED_OUT
+skip-if = xorigin
+  toolkit == 'android' # xorigin: Bug 1682519, android: TIMED_OUT
 [test_bug412567.html]
 [test_bug418986-3.html]
 [test_bug422132.html]
@ -88,7 +89,8 @@ skip-if = toolkit == 'android'
 [test_bug605242.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug607464.html]
-skip-if = toolkit == 'android' || e10s #CRASH_DUMP, RANDOM, bug 1400586
+skip-if = toolkit == 'android'
+  e10s #CRASH_DUMP, RANDOM, bug 1400586
 [test_bug613634.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug615597.html]
@ -105,7 +107,8 @@ skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug656379-1.html]
 skip-if = toolkit == 'android'
 [test_bug656379-2.html]
-skip-if = toolkit == 'android' || (verify && (os == 'linux')) #CRASH_DUMP, RANDOM
+skip-if = toolkit == 'android'
+  (verify && (os == 'linux')) #CRASH_DUMP, RANDOM
 [test_bug656954.html]
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM
 [test_bug659071.html]
@ -227,7 +230,8 @@ skip-if = !debug # The mode change event is available only on debug build
 [test_use_split_keypress_event_model_on_old_Office_Online_Server.html]
 skip-if = !debug # The mode change event is available only on debug build
 [test_wheel_default_action.html]
-skip-if = os == 'linux' || toolkit == 'android'
+skip-if = os == 'linux'
+  toolkit == 'android'
 [test_bug687787.html]
 [test_bug1305458.html]
 [test_bug1298970.html]
--- a/dom/html/test/browser.ini
+++ b/dom/html/test/browser.ini
@ -32,7 +32,8 @@ tags = fullscreen
 [browser_fullscreen-newtab.js]
 tags = fullscreen
 support-files = file_fullscreen-newtab.html
-skip-if = os == 'mac' || (os == 'linux' && bits == 64 && os_version == '18.04')  # Bug 1601460, Bug 1494843
+skip-if = os == 'mac'
+  (os == 'linux' && bits == 64 && os_version == '18.04')  # Bug 1601460, Bug 1494843
 [browser_submission_flush.js]
 [browser_refresh_after_document_write.js]
 support-files =
--- a/dom/html/test/forms/mochitest.ini
+++ b/dom/html/test/forms/mochitest.ini
@ -57,7 +57,8 @@ support-files = file_login_fields.html
 [test_input_number_key_events.html]
 [test_input_number_mouse_events.html]
 # Not run on Firefox for Android where the spin buttons are hidden:
-skip-if = os == "android" || (os == "mac" && debug) # Bug 1484442
+skip-if = os == "android"
+  (os == "mac" && debug) # Bug 1484442
 [test_input_number_rounding.html]
 [test_input_number_validation.html]
 [test_input_number_focus.html]
--- a/dom/html/test/mochitest.ini
+++ b/dom/html/test/mochitest.ini
@ -344,7 +344,8 @@ skip-if = toolkit == 'android' # form control not selected/checked with synthesi
 [test_bug615595.html]
 fail-if = xorigin
 [test_bug615833.html]
-skip-if = toolkit == 'android' || os == 'mac' #TIMED_OUT # form control not selected/checked with synthesizeMouse, osx(bug 1275664)
+skip-if = toolkit == 'android'
+  os == 'mac' #TIMED_OUT # form control not selected/checked with synthesizeMouse, osx(bug 1275664)
 [test_bug617528.html]
 [test_bug618948.html]
 [test_bug619278.html]
@ -471,7 +472,9 @@ support-files = file_fullscreen_meta_viewport.html

 [test_fullscreen-api-race.html]
 tags = fullscreen
-skip-if = toolkit == 'android' || (verify && debug && os == 'mac') || (os == "mac" && debug) # Android: same as test_fullscreen-api.html, 1356570
+skip-if = toolkit == 'android' # same as test_fullscreen-api.html, 1356570
+  (verify && debug && os == 'mac')
+  (os == "mac" && debug)
 support-files =
  file_fullscreen-api-race.html
 [test_hidden.html]
@ -533,7 +536,8 @@ tags = openwindow
 [test_bug340017.xhtml]
 [test_bug359657.html]
 [test_bug369370.html]
-skip-if = toolkit == "android" || os == 'linux' # disabled on linux bug 1258103
+skip-if = toolkit == "android"
+  os == 'linux' # disabled on linux bug 1258103
 [test_bug380383.html]
 [test_bug402680.html]
 [test_bug403868.html]
--- a/dom/ipc/tests/browser.ini
+++ b/dom/ipc/tests/browser.ini
@ -12,11 +12,14 @@ skip-if = !crashreporter
 [browser_ProcessPriorityManager.js]
 skip-if = os != "win" # The Process Priority Manager is only enabled for Windows so far. Bug 1522879.
 [browser_crash_oopiframe.js]
-skip-if = !fission || !crashreporter || verify
+skip-if = !fission
+  !crashreporter
+  verify
  apple_silicon  # crash
 [browser_domainPolicy.js]
 [browser_memory_distribution_telemetry.js]
-skip-if = true || !e10s # This is an e10s only probe, but the test is currently broken. See Bug 1449991
+skip-if = true
+  !e10s # This is an e10s only probe, but the test is currently broken. See Bug 1449991
 [browser_cancel_content_js.js]
 skip-if = !e10s
 [browser_bug1646088.js]
--- a/dom/ipc/tests/mochitest.ini
+++ b/dom/ipc/tests/mochitest.ini
@ -1,12 +1,16 @@
 [DEFAULT]

 [test_temporaryfile_stream.html]
-skip-if = !e10s || toolkit == 'android' || (os == "win" && processor == "aarch64") # Bug 1525959, aarch64 due to 1531150
+skip-if = !e10s
+  toolkit == 'android'
+  (os == "win" && processor == "aarch64") # Bug 1525959, aarch64 due to 1531150
 support-files =
  blob_verify.sjs
  !/dom/canvas/test/captureStream_common.js
 [test_Preallocated.html]
-skip-if = !e10s || toolkit == 'android' || tsan # Bug 1525959. tsan: Bug 1683730 
+skip-if = !e10s
+  toolkit == 'android'
+  tsan # Bug 1525959. tsan: Bug 1683730
 [test_window_open_discarded_bc.html]
 skip-if = toolkit == 'android'
 [test_bcg_processes.html]
--- a/dom/media/mediasource/test/mochitest.ini
+++ b/dom/media/mediasource/test/mochitest.ini
@ -79,7 +79,8 @@ tags = firstpartyisolation
 [test_FrameSelection.html]
 skip-if = toolkit == 'android' # bug 1341519, bug 1401090
 [test_FrameSelection_mp4.html]
-skip-if = os == 'win' || (os == 'mac' && os_version == '10.14') # bug 1487973, mac due to bug 1487973
+skip-if = os == 'win'
+  (os == 'mac' && os_version == '10.14') # bug 1487973, mac due to bug 1487973
 [test_HaveMetadataUnbufferedSeek.html]
 [test_HaveMetadataUnbufferedSeek_mp4.html]
 [test_LiveSeekable.html]
--- a/dom/media/test/mochitest.ini
+++ b/dom/media/test/mochitest.ini
@ -796,22 +796,26 @@ scheme=https
 skip-if = toolkit == 'android' # bug 1149374
 scheme=https
 [test_eme_detach_media_keys.html]
-skip-if = toolkit == 'android' || (verify && debug && (os == 'linux' || os == 'win')) # bug 1149374
+skip-if = toolkit == 'android'
+  (verify && debug && (os == 'linux' || os == 'win')) # bug 1149374
 scheme=https
 [test_eme_detach_reattach_same_mediakeys_during_playback.html]
 skip-if = toolkit == 'android' # bug 1149374
 scheme=https
 [test_eme_initDataTypes.html]
-skip-if = toolkit == 'android' || (verify && debug && (os == 'linux' || os == 'mac')) # bug 1149374
+skip-if = toolkit == 'android'
+  (verify && debug && (os == 'linux' || os == 'mac')) # bug 1149374
 scheme=https
 [test_eme_missing_pssh.html]
-skip-if = toolkit == 'android' || (verify && debug && (os == 'mac')) # bug 1149374
+skip-if = toolkit == 'android'
+  (verify && debug && (os == 'mac')) # bug 1149374
 scheme=https
 [test_eme_non_mse_fails.html]
 skip-if = toolkit == 'android' # bug 1149374
 scheme=https
 [test_eme_request_notifications.html]
-skip-if = toolkit == 'android' || (verify && debug && (os == 'linux')) # bug 1149374
+skip-if = toolkit == 'android'
+  (verify && debug && (os == 'linux')) # bug 1149374
 scheme=https
 [test_eme_playback.html]
 skip-if =
@ -1184,9 +1188,11 @@ skip-if = toolkit == 'android' # bug 1346705
 tags = suspend

 [test_temporary_file_blob_video_plays.html]
-skip-if = toolkit == 'android' || (os == 'win' && processor == 'aarch64') # bug 1533534 # android(bug 1232305)
+skip-if = toolkit == 'android'
+  (os == 'win' && processor == 'aarch64') # bug 1533534 # android(bug 1232305)
 [test_videoPlaybackQuality_totalFrames.html]
-skip-if = os == 'win' || (os == 'mac' && os_version == '10.14') # bug 1374189, mac due to bug 1544938
+skip-if = os == 'win'
+  (os == 'mac' && os_version == '10.14') # bug 1374189, mac due to bug 1544938

 [test_video_gzip_encoding.html]

@ -1200,7 +1206,8 @@ tags = hls
 [test_hls_player_independency.html]
 # There's a limit for creating decoder when API lever < 18(Bug 1278574)
 # We could skip the test in that case as we cannot play 2 video at a time.
-skip-if = toolkit != 'android' || android_version < '18'
+skip-if = toolkit != 'android'
+  android_version < '18'
 tags = hls

 [test_bug1431810_opus_downmix_to_mono.html]
--- a/dom/media/webaudio/test/mochitest.ini
+++ b/dom/media/webaudio/test/mochitest.ini
@ -125,7 +125,8 @@ skip-if = (os == "win" && processor == "aarch64") # aarch64 due to 1538360
 [test_convolverNodeDelay.html]
 [test_convolverNodeFiniteInfluence.html]
 [test_convolverNodeOOM.html]
-skip-if = asan || tsan # 1672869
+skip-if = asan
+  tsan # 1672869
 [test_convolverNodeNormalization.html]
 [test_convolverNodePassThrough.html]
 [test_convolverNodeWithGain.html]
@ -256,5 +257,7 @@ skip-if = (os == "win" && processor == "aarch64") # aarch64 due to 1538360
 [test_audioContextParams_sampleRate.html]
 [test_webAudio_muteTab.html]
 scheme = https
-skip-if = os == 'mac' || os == 'win' || toolkit == 'android' # Bug 1404995, no loopback devices on some platforms
+skip-if = os == 'mac'
+  os == 'win'
+  toolkit == 'android' # Bug 1404995, no loopback devices on some platforms
 [test_audioContextParams_recordNonDefaultSampleRate.html]
--- a/dom/media/webrtc/tests/mochitests/mochitest.ini
+++ b/dom/media/webrtc/tests/mochitests/mochitest.ini
@ -68,19 +68,31 @@ skip-if =
 run-sequentially = sets prefs that may disrupt other tests
 [test_getUserMedia_active_autoplay.html]
 [test_getUserMedia_audioCapture.html]
-skip-if = toolkit == 'android' || (os == "win" && processor == "aarch64") # android(Bug 1189784, timeouts on 4.3 emulator), android(Bug 1264333), aarch64 due to 1538359
+skip-if = toolkit == 'android'
+  (os == "win" && processor == "aarch64") # android(Bug 1189784, timeouts on 4.3 emulator), android(Bug 1264333), aarch64 due to 1538359
 [test_getUserMedia_addTrackRemoveTrack.html]
 [test_getUserMedia_addtrack_removetrack_events.html]
 [test_getUserMedia_audioConstraints.html]
-skip-if = os == 'mac' || os == 'win' || toolkit == 'android' # Bug 1404995, no loopback devices on some platforms
+skip-if = os == 'mac'
+  os == 'win'
+  toolkit == 'android' # Bug 1404995, no loopback devices on some platforms
 [test_getUserMedia_audioConstraints_concurrentIframes.html]
-skip-if = os == 'mac' || os == 'win' || toolkit == 'android' || (os == 'linux' && debug)  # Bug 1404995, no loopback devices on some platforms # Bug 1481101
+skip-if = os == 'mac'
+  os == 'win'
+  toolkit == 'android'
+  (os == 'linux' && debug)  # Bug 1404995, no loopback devices on some platforms # Bug 1481101
 [test_getUserMedia_audioConstraints_concurrentStreams.html]
-skip-if = os == 'mac' || os == 'win' || toolkit == 'android' # Bug 1404995, no loopback devices on some platforms
+skip-if = os == 'mac'
+  os == 'win'
+  toolkit == 'android' # Bug 1404995, no loopback devices on some platforms
 [test_getUserMedia_basicAudio_loopback.html]
-skip-if = os == 'mac' || os == 'win' || toolkit == 'android' # Bug 1404995, no loopback devices on some platforms
+skip-if = os == 'mac'
+  os == 'win'
+  toolkit == 'android' # Bug 1404995, no loopback devices on some platforms
 [test_defaultAudioConstraints.html]
-skip-if = os == 'mac' || os == 'win' || toolkit == 'android' # Bug 1404995, no loopback devices on some platforms
+skip-if = os == 'mac'
+  os == 'win'
+  toolkit == 'android' # Bug 1404995, no loopback devices on some platforms
 [test_getUserMedia_basicAudio.html]
 [test_getUserMedia_basicVideo.html]
 [test_getUserMedia_basicVideo_playAfterLoadedmetadata.html]
@ -317,7 +329,8 @@ scheme=http
 [test_peerConnection_stats_jitter.html]
 skip-if = tsan # Bug 1672590, TSan is just too slow to pass this test
 [test_peerConnection_stats_relayProtocol.html]
-skip-if = toolkit == 'android' || socketprocess_e10s # android(Bug 1189784, timeouts on 4.3 emulator, Bug 1373858, Bug 1521117)
+skip-if = toolkit == 'android'
+  socketprocess_e10s # android(Bug 1189784, timeouts on 4.3 emulator, Bug 1373858, Bug 1521117)
 scheme=http
 [test_peerConnection_sender_and_receiver_stats.html]
 [test_peerConnection_trackless_sender_stats.html]
--- a/dom/media/webvtt/test/mochitest/mochitest.ini
+++ b/dom/media/webvtt/test/mochitest/mochitest.ini
@ -37,7 +37,8 @@ skip-if = (android_version == '25' && debug) # android(bug 1232305)
 [test_testtrack_cors_no_response.html]
 [test_texttrack_cors_preload_none.html]
 [test_texttrack_mode_change_during_loading.html]
-skip-if = true || toolkit == 'android' # Bug 1636572, android(bug 1562021)
+skip-if = true
+  toolkit == 'android' # Bug 1636572, android(bug 1562021)
 [test_texttrack_moz.html]
 [test_vttparser.html]
 [test_webvtt_empty_displaystate.html]
--- a/dom/payments/test/browser.ini
+++ b/dom/payments/test/browser.ini
@ -2,7 +2,9 @@
 prefs =
  dom.payments.request.enabled=true
 # skip-if !e10s will be removed once non-e10s is supported
-skip-if = !e10s || !nightly_build || true # we don't ship webpayments right now bug 1514425
+skip-if = !e10s
+  !nightly_build
+  true # we don't ship webpayments right now bug 1514425
 support-files =
  head.js
  simple_payment_request.html
--- a/dom/payments/test/mochitest.ini
+++ b/dom/payments/test/mochitest.ini
@ -3,7 +3,10 @@ prefs =
  dom.payments.request.enabled=true
 # skip-if !e10s will be removed once non-e10s is supported
 # Android crashes on nearly all tests, bug 1525959
-skip-if = !e10s || !nightly_build || toolkit == 'android' || true # we don't ship webpayments right now bug 1514425
+skip-if = !e10s
+  !nightly_build
+  toolkit == 'android'
+  true # we don't ship webpayments right now bug 1514425
 scheme = https
 support-files =
  blank_page.html
--- a/dom/push/test/mochitest.ini
+++ b/dom/push/test/mochitest.ini
@ -29,6 +29,10 @@ scheme = https
 [test_try_registering_offline_disabled.html]
 skip-if = os == "win" # Bug 1373346
 [test_serviceworker_lifetime.html]
-skip-if = serviceworker_e10s || !e10s || os == "win" || os =="linux" && bits == 64 || os =="mac" # e10s: Bug 1433689, Windows: Bug 1373346, Bug 1578333, Bug 1578374
+skip-if = serviceworker_e10s
+  !e10s
+  os == "win"
+  os =="linux" && bits == 64
+  os =="mac" # e10s: Bug 1433689, Windows: Bug 1373346, Bug 1578333, Bug 1578374
 [test_error_reporting.html]
 skip-if = serviceworker_e10s
--- a/dom/security/test/general/chrome.ini
+++ b/dom/security/test/general/chrome.ini
@ -6,5 +6,6 @@ support-files =
 [test_innerhtml_sanitizer.html]
 [test_innerhtml_sanitizer.xhtml]
 [test_bug1277803.xhtml]
-skip-if = os == 'android' || verify
+skip-if = os == 'android'
+    verify

--- a/dom/serviceworkers/test/browser.ini
+++ b/dom/serviceworkers/test/browser.ini
@ -40,4 +40,5 @@ skip-if = true # Crashes: @ mozilla::dom::ServiceWorkerManagerService::Propagate
 skip-if = serviceworker_e10s
 [browser_unregister_with_containers.js]
 [browser_userContextId_openWindow.js]
-skip-if = !e10s || serviceworker_e10s
+skip-if = !e10s
+  serviceworker_e10s
--- a/dom/serviceworkers/test/mochitest.ini
+++ b/dom/serviceworkers/test/mochitest.ini
@ -332,7 +332,8 @@ support-files =
  window_party_iframes.html
 [test_unregister.html]
 [test_unresolved_fetch_interception.html]
-skip-if = verify || serviceworker_e10s
+skip-if = verify
+  serviceworker_e10s
 [test_workerUnregister.html]
 [test_workerUpdate.html]
 [test_workerupdatefoundevent.html]
@ -345,4 +346,5 @@ skip-if = verify || serviceworker_e10s
 skip-if = toolkit == 'android' #Bug 1430182
 support-files = script_file_upload.js sw_file_upload.js server_file_upload.sjs
 [test_self_update_worker.html]
-skip-if = serviceworker_e10s || (toolkit == 'android' && !is_fennec)
+skip-if = serviceworker_e10s
+  (toolkit == 'android' && !is_fennec)
--- a/dom/tests/browser/browser.ini
+++ b/dom/tests/browser/browser.ini
@ -59,12 +59,19 @@ support-files =
  beforeunload_test_page.html
 run-if = e10s
 [browser_largeAllocation_win32.js]
-skip-if = fission || !e10s || os != "win" || processor != "x86" # Large-Allocation requires non-fission e10s
+skip-if = fission
+  !e10s
+  os != "win"
+  processor != "x86" # Large-Allocation requires non-fission e10s
 [browser_largeAllocation_non_win32.js]
-skip-if = fission || !e10s || (os == "win" && processor == "x86") # Large-Allocation requires non-fission e10s
+skip-if = fission
+  !e10s
+  (os == "win" && processor == "x86") # Large-Allocation requires non-fission e10s
 [browser_localStorage_e10s.js]
 fail-if = fission
-skip-if = !e10s || verify || tsan # This is a test of e10s functionality. Times out on TSan intermittently.
+skip-if = !e10s
+  verify
+  tsan # This is a test of e10s functionality. Times out on TSan intermittently.
 [browser_localStorage_privatestorageevent.js]
 [browser_localStorage_snapshotting_e10s.js]
 fail-if = fission
@ -91,7 +98,8 @@ support-files =
  focus_after_prompt.html
 [browser_test_new_window_from_content.js]
 tags = openwindow
-skip-if = toolkit == 'android'  || (os == "linux" && debug) # see bug 1261495 for Linux debug time outs
+skip-if = toolkit == 'android'
+  (os == "linux" && debug) # see bug 1261495 for Linux debug time outs
 support-files =
  test_new_window_from_content_child.html
 [browser_test_toolbars_visibility.js]
--- a/dom/tests/mochitest/bugs/mochitest.ini
+++ b/dom/tests/mochitest/bugs/mochitest.ini
@ -140,7 +140,10 @@ support-files = file_bug873229.js
 [test_onerror_message.html]
 [test_protochains.html]
 [test_resize_move_windows.html]
-skip-if = toolkit == 'android' || os == 'linux' || (os == "mac" && !debug) || (devedition && os == 'win' && bits == 32) #Windows can't change size and position on Android; Windows: bug 1540554, osx: bug 1661132
+skip-if = toolkit == 'android'
+  os == 'linux'
+  (os == "mac" && !debug)
+  (devedition && os == 'win' && bits == 32) #Windows can't change size and position on Android; Windows: bug 1540554, osx: bug 1661132
 support-files =
  file_resize_move_windows_1.html
  file_resize_move_windows_2.html
--- a/dom/tests/mochitest/fetch/mochitest.ini
+++ b/dom/tests/mochitest/fetch/mochitest.ini
@ -59,7 +59,9 @@ prefs =
 [test_fetch_cached_redirect.html]
 [test_fetch_cors.html]
 [test_fetch_cors_sw_reroute.html]
-skip-if = os == "linux" || (os == "win" && os_version == "10.0") || os == "android" # Bug 1210282, 1623134
+skip-if = os == "linux"
+  (os == "win" && os_version == "10.0")
+  os == "android" # Bug 1210282, 1623134
 [test_fetch_cors_sw_empty_reroute.html]
 skip-if = os == "android" # Bug 1623134
 [test_fetch_csp_block.html]
--- a/dom/tests/mochitest/keyhandling/chrome.ini
+++ b/dom/tests/mochitest/keyhandling/chrome.ini
@ -5,7 +5,9 @@ prefs =
  dom.security.skip_remote_script_assertion_in_system_priv_context=true

 # nsIWidget::SynthesizeNativeKeyEvent() required (Bug 1410525 for headless)
-skip-if = os == 'linux' || os == 'android' || headless
+skip-if = os == 'linux'
+  os == 'android'
+  headless

 [test_browser.xhtml]
 support-files =
--- a/dom/tests/mochitest/keyhandling/mochitest.ini
+++ b/dom/tests/mochitest/keyhandling/mochitest.ini
@ -1,6 +1,8 @@
 [DEFAULT]
 # nsIWidget::SynthesizeNativeKeyEvent() required (Bug 1410525 for headless)
-skip-if = os == 'linux' || os == 'android' || headless
+skip-if = os == 'linux'
+  os == 'android'
+  headless

 [test_input.html]
 [test_textarea.html]
--- a/dom/tests/unit/xpcshell.ini
+++ b/dom/tests/unit/xpcshell.ini
@ -8,13 +8,16 @@ head =
 [test_geolocation_monitor.js]
 [test_geolocation_timeout.js]
 [test_geolocation_timeout_wrap.js]
-skip-if = os == "mac" || os == "android"
+skip-if = os == "mac"
+    os == "android"
 [test_geolocation_reset_accuracy.js]
 [test_geolocation_reset_accuracy_wrap.js]
-skip-if = os == "mac" || os == "android"
+skip-if = os == "mac"
+    os == "android"
 [test_geolocation_position_unavailable.js]
 [test_geolocation_position_unavailable_wrap.js]
-skip-if = os == "mac" || os == "android"
+skip-if = os == "mac"
+    os == "android"
 [test_PromiseDebugging.js]
 [test_xhr_init.js]
 [test_geolocation_provider_timeout.js]
--- a/dom/webauthn/tests/mochitest.ini
+++ b/dom/webauthn/tests/mochitest.ini
@ -4,7 +4,8 @@ support-files =
  u2futil.js
  pkijs/*
  get_assertion_dead_object.html
-skip-if = !e10s || os == 'android'
+skip-if = !e10s
+  os == 'android'
 scheme = https

 [test_webauthn_abort_signal.html]
--- a/dom/workers/test/chrome.ini
+++ b/dom/workers/test/chrome.ini
@ -58,7 +58,8 @@ support-files =
 [test_WorkerDebugger.initialize.xhtml]
 [test_WorkerDebugger.postMessage.xhtml]
 [test_WorkerDebugger.xhtml]
-skip-if = webrender || (verify && !debug && os == 'linux') # Frequent intermittent on QR platforms Bug 1454935
+skip-if = webrender
+  (verify && !debug && os == 'linux') # Frequent intermittent on QR platforms Bug 1454935
 [test_WorkerDebuggerGlobalScope.createSandbox.xhtml]
 [test_WorkerDebuggerGlobalScope.enterEventLoop.xhtml]
 [test_WorkerDebuggerGlobalScope.reportError.xhtml]
--- a/dom/xhr/tests/mochitest.ini
+++ b/dom/xhr/tests/mochitest.ini
@ -115,7 +115,8 @@ fail-if = !e10s
 [test_sync_xhr_nested.html]
 support-files =
  file_sync_xhr_nested_helper.html
-skip-if = !e10s || release_or_beta # Input event will be discarded during sync XHR, thus timeout
+skip-if = !e10s
+  release_or_beta # Input event will be discarded during sync XHR, thus timeout
 [test_nestedSyncXHR.html]
 [test_event_listener_leaks.html]
 skip-if = (os == "win" && processor == "aarch64") #bug 1535784