Move SingleProcessMash tests to main waterfall

The tests have been running for a while now and look stable.  Move them over
to the main waterfall so they start being run by the CQ.

Bug: 874090
Bug: 847585
Change-Id: I8b013c568d0abbfb2697d5166dd6edda31bbbf88
Reviewed-on: https://chromium-review.googlesource.com/1212093
Commit-Queue: Ryan Cui <rcui@chromium.org>
Reviewed-by: Scott Violet <sky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589655}

testing/buildbot/chromium.chromiumos.json

@@ -390,6 +390,17 @@
         },
         "test": "ash_unittests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.ash_unittests.filter"
+        ],
+        "name": "single_process_mash_ash_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "ash_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -658,6 +669,17 @@
         },
         "test": "exo_unittests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.exo_unittests.filter"
+        ],
+        "name": "single_process_mash_exo_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "exo_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1059,6 +1081,17 @@
         },
         "test": "ash_unittests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.ash_unittests.filter"
+        ],
+        "name": "single_process_mash_ash_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "ash_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1326,6 +1359,17 @@
         },
         "test": "exo_unittests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.exo_unittests.filter"
+        ],
+        "name": "single_process_mash_exo_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "exo_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/chromium.fyi.json

@@ -1329,17 +1329,6 @@
       "mash:all"
     ],
     "gtest_tests": [
-      {
-        "args": [
-          "--enable-features=SingleProcessMash",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.fyi.ash_unittests.filter"
-        ],
-        "name": "single_process_mash_fyi_ash_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "ash_unittests"
-      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -1360,20 +1349,6 @@
         },
         "test": "browser_tests"
       },
-      {
-        "args": [
-          "--enable-features=SingleProcessMash",
-          "--override-use-software-gl-for-tests",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.fyi.browser_tests.filter"
-        ],
-        "name": "single_process_mash_fyi_browser_tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "hard_timeout": 1800,
-          "shards": 10
-        },
-        "test": "browser_tests"
-      },
       {
         "args": [
           "--enable-features=VizDisplayCompositor"
@@ -1422,17 +1397,6 @@
         },
         "test": "content_unittests"
       },
-      {
-        "args": [
-          "--enable-features=SingleProcessMash",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.fyi.exo_unittests.filter"
-        ],
-        "name": "single_process_mash_fyi_exo_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true
-        },
-        "test": "exo_unittests"
-      },
       {
         "args": [
           "--enable-features=VizDisplayCompositor"

testing/buildbot/chromium.memory.json

@@ -4203,6 +4203,17 @@
         },
         "test": "ash_unittests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.ash_unittests.filter"
+        ],
+        "name": "single_process_mash_ash_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "ash_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -4472,6 +4483,17 @@
         },
         "test": "exo_unittests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.exo_unittests.filter"
+        ],
+        "name": "single_process_mash_exo_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "exo_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -4871,6 +4893,17 @@
         },
         "test": "ash_unittests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.ash_unittests.filter"
+        ],
+        "name": "single_process_mash_ash_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "ash_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true
@@ -5140,6 +5173,17 @@
         },
         "test": "exo_unittests"
       },
+      {
+        "args": [
+          "--enable-features=SingleProcessMash",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.exo_unittests.filter"
+        ],
+        "name": "single_process_mash_exo_unittests",
+        "swarming": {
+          "can_use_on_swarming_builders": true
+        },
+        "test": "exo_unittests"
+      },
       {
         "swarming": {
           "can_use_on_swarming_builders": true

testing/buildbot/filters/BUILD.gn

@@ -20,7 +20,7 @@ source_set("ash_unittests_filters") {
   testonly = true
 
   data = [
-    "//testing/buildbot/filters/chromeos.single_process_mash.fyi.ash_unittests.filter",
+    "//testing/buildbot/filters/chromeos.single_process_mash.ash_unittests.filter",
   ]
 }
 
@@ -31,7 +31,6 @@ source_set("browser_tests_filters") {
     "//testing/buildbot/filters/chromeos.mash.browser_tests.filter",
     "//testing/buildbot/filters/chromeos.mash.fyi.browser_tests.filter",
     "//testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter",
-    "//testing/buildbot/filters/chromeos.single_process_mash.fyi.browser_tests.filter",
     "//testing/buildbot/filters/mojo.fyi.network_browser_tests.filter",
     "//testing/buildbot/filters/webui_polymer2_browser_tests.filter",
     "//testing/buildbot/filters/webrtc_functional.browser_tests.filter",
@@ -68,7 +67,7 @@ source_set("exo_unittests_filters") {
   testonly = true
 
   data = [
-    "//testing/buildbot/filters/chromeos.single_process_mash.fyi.exo_unittests.filter",
+    "//testing/buildbot/filters/chromeos.single_process_mash.exo_unittests.filter",
   ]
 }
 

testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter

-# Placeholder tests that validate basic login functionality.
-# TODO: replace with full suite and blacklist once it's ready.
-# Bug: http://crbug.com/874090
-LoginPromptBrowserTest.*
-LoginUtilsTest.*
-LoginUIKeyboardTestWithUsersAndOwner.*
+# These tests currently fail with SingleProcessMash enabled.
+# Bug: crbug.com/877118
+
+# --------------------------------------------------
+# Tests that are also blacklisted for Mash.
+# --------------------------------------------------
+
+# Extensive use of ash::WindowState.
+-InitiallyMaximized/AcceleratorCommandsFullscreenBrowserTest.*
+-InitiallyMaximized/AcceleratorCommandsPlatformAppFullscreenBrowserTest.*
+-InitiallyRestored/AcceleratorCommandsFullscreenBrowserTest.*
+-InitiallyRestored/AcceleratorCommandsPlatformAppFullscreenBrowserTest.*
+
+# Virtual keyboard not supported.
+-DefaultKeyboardExtensionBrowserTest.*
+-KeyboardEndToEndTest.*
+-KioskVirtualKeyboardTest.*
+-VirtualKeyboardAppWindowTest.*
+-VirtualKeyboardStateTest.*
+-VirtualKeyboardWebContentTest.*
+
+# AutomationManagerAura::Enable() uses ash to get active window. More generally,
+# chrome a11y code directly accesses ash system UI widgets and views.
+-AutomationApiTest.*
+-AutomationApiTestWithDeviceScaleFactor.*
+-AutomationManagerAuraBrowserTest.*
+
+# The browser frame is a work in progress.
+-BrowserNonClientFrameViewAshTest.AvatarDisplayOnTeleportedWindow/*
+-BrowserNonClientFrameViewAshTest.HeaderHeightForSnappedBrowserInSplitView/*
+-BrowserNonClientFrameViewAshTest.ImmersiveModeTopViewInset/*
+-BrowserNonClientFrameViewAshTest.TopViewInset/*
+
+# Touch gestures don't work in webcontents. https://crbug.com/866991.
+-TopControlsSlideControllerTest.DisplayRotation
+-TopControlsSlideControllerTest.TestScrollingPage
+-TopControlsSlideControllerTest.TestScrollingPageAndSwitchingToNTP
+-TopControlsSlideControllerTest.TestClosingATab
+-TopControlsSlideControllerTest.TestFocusEditableElements
+
+# Direct access to ash window frames, tablet mode, overview mode, etc.
+-NonHomeLauncherBrowserNonClientFrameViewAshTest.*
+
+# Fix immersive fullscreen mode in mash. https://crbug.com/844748.
+# Needs EventGenerator to work across window tree hosts. crbug.com/814675
+-ImmersiveModeBrowserViewTest.TestCaptionButtonsReceiveEventsInAppImmersiveMode*
+-ImmersiveModeBrowserViewTest.TestCaptionButtonsReceiveEventsInBrowserImmersiveMode*
+
+# Need pixel copy support. http://crbug.com/754864 http://crbug.com/754872
+-CastMirroringServiceHostBrowserTest.CaptureTabVideo
+-CastStreamingApiTestWithPixelOutput.*
+-TabCaptureApiPixelTest.*
+
+# RefCounted check failed: CalledOnValidSequence() from SchedulerWorkerDelegate::OnMainExit
+-CheckSystemTokenAvailability/EnterprisePlatformKeysTest.*
+
+# aura::CrashInFlightChange::ChangeFailed() when searching PDF.
+-ChromeFindRequestManagerTest.*
+-PDFExtensionTest.*
+-PDFExtensionHitTestTest.*
+
+# ash::Shell access for LogoutConfirmationController
+-DeviceLocalAccountTest.*
+
+# Fails: immersive_controller->IsRevealed() returns false.
+# http://crbug.com/791148
+-vZoomBubbleBrowserTest.*
+
+# ash::Shell::display_manager() to update displays.
+# http://crbug.com/831826
+-PolicyDisplayRotationDefault/DisplayRotationDefaultTest.*
+
+# JS failure: hasAccessToCurrentWindow: FAIL (no message)
+-LockScreenNoteTakingTest.*
+
+# desktop_window_tree_host_mus.cc(796) Check failed: !window->GetRootWindow() || this->window() == window->GetRootWindow().
+-LoginFeedbackTest.*
+
+# Missing magnification manager and also RefCounted check failed:
+# CalledOnValidSequence() from SchedulerWorkerDelegate::OnMainExit
+-LoginScreenDefaultPolicyLoginScreenBrowsertest.*
+
+# ash::Shell access in test for display configuration.
+# http://crbug.com/831826
+-ShelfAppBrowserTest.LaunchAppFromDisplayWithoutFocus*
+
+# Timeout.
+-StartupMetricsTest.*
+
+# Timeouts in content::WaitForChildFrameSurfaceReady()
+# Crashes in viz::HostFrameSinkManager::RegisterFrameSinkId()
+# http://crbug.com/755328
+-WebViewTest.*
+
+# Needs EventGenerator to work across window tree hosts. crbug.com/814675
+-RoundedOmniboxPopupContentsViewTest.ClickOmnibox*
+
+# RenderFrameMetadata observation not supported: https://crbug.com/820974
+-WebViewFocusBrowserPluginSpecificTest.*
+-WebViewScrollBubbling/WebViewGuestScrollTest.ScrollLatchingPreservedInGuests/*
+-WebViewScrollBubbling/WebViewGuestScrollTouchTest.*
+-WebViewScrollGuestContentBrowserPluginSpecificTest.OverscrollControllerSeesConsumedScrollsInGuest
+-WebViewScrollBubbling/WebViewGuestScrollTest.TestGuestWheelScrollsBubble/*
+
+# FATAL:hit_test_region_observer.cc(164)] Check failed: frame_sink_id.is_valid().
+-WebViewGuestTouchFocusBrowserPluginSpecificTest.TouchFocusesBrowserPluginInEmbedder
+
+# Picture-in-Picture does not work with mash because VideoSurfaceLayer is
+# disabled.
+# https://crbug.com/827327
+-PictureInPictureWindowControllerBrowserTest.*
+-ControlPictureInPictureWindowControllerBrowserTest.*
+-BrowserActionApiTest.TestPictureInPictureOnBrowserActionIconClick
+-PlatformAppBrowserTest.PictureInPicture
+-PictureInPictureLazyBackgroundPageApiTest.PictureInPictureInBackgroundPage
+
+# These started failing with the switch to ws2.
+# https:://crbug.com/855767
+-AppWindowApiTest.OnRestoredEvent
+-BrowserActionApiTest.BrowserActionPopupWithIframe
+-FirstRunUIBrowserTest.ModalWindowDoesNotBlock
+-LauncherPlatformAppBrowserTest.AltNumberAppsTabbing
+-LauncherPlatformAppBrowserTest.PackagedAppClickBehaviorInMinimizeMode
+-LoginWebDialogTest.CannotMinimize
+-LoginWebDialogTest.CloseDialogByAccelerator
+-ShelfAppBrowserTest.AltNumberTabsTabbing
+-ShelfAppBrowserTestNoDefaultBrowser.AltNumberBrowserTabbing
+-ShelfAppBrowserTestNoDefaultBrowser.BrowserShortcutLauncherItemController
+
+# Excluded from Mash because pointer events from EventGenerator aren't seen.
+# https://crbug.com/814675
+-ChromeOSInfoPrivateTest.StylusSeen
+
+# --------------------------------------------------
+# Tests failing only for SingleProcessMash.
+# --------------------------------------------------
+
+# Uses ash::WindowState in browser process.
+-AcceleratorCommandsBrowserTest.ToggleMaximized
+
+# Crashes on exit, even without SingleProcessMash.
+-AffiliationCheck/EnterpriseDeviceAttributesTest.Success/*
+
+# Flaky tests. crbug.com/880584
+-AutoplayMetricsBrowserTest.RecordAutoplayAttemptUkm
+
+# Blub Arc tests.
+-Blub/UnaffiliatedArcAllowedTest.ProfileTest/0
+-Blub/UnaffiliatedArcAllowedTest.ProfileTest/1
+
+# Browser command controller tests.
+-BrowserCommandControllerBrowserTest.LockedFullscreen
+
+# Enterprise keys tests.
+-CheckSystemTokenAvailability/EnterprisePlatformKeysTest.Basic/*
+
+# Ash native views tests.
+-ChromeNativeAppWindowViewsAuraAshBrowserTest.*
+
+# Context menu tests.
+-ContextMenuBrowserTest.ContextMenuEntriesAreDisabledInLockedFullscreen
+
+# Default extension tests.
+-DefaultProfileExtensionBrowserTest.NoExtensionHosts
+
+# Encrypted media tests are flaky due to race condition. crbug.com/880584
+-ECKEncryptedMediaTest.*
+-EncryptedMediaTest.*
+-MSE_ClearKey/EncryptedMediaTest.*
+-MSE_ExternalClearKey/EncryptedMediaTest.*
+-MSE_Widevine/EncryptedMediaTest.*
+-SRC_ClearKey/EncryptedMediaTest.*
+-SRC_ExternalClearKey/EncryptedMediaTest.*
+
+# Immersive mode tests.
+-ImmersiveModeBrowserViewTest.TabNavigationAcceleratorsFullscreenBrowser/material
+
+# Lock screen tests.
+-LockScreenNoteTakingTest.Launch
+
+# Login screen tests.
+-LoginScreenPolicyTest.DisableSupervisedUsers
+
+# PRE steps crash on shutdown.
+# FATAL:ref_counted.h(85)] Check failed: CalledOnValidSequence()
+-ManagedWithoutPermission/ManagedWithoutPermissionPlatformKeysTest.*
+-ManagedWithPermission/ManagedWithPermissionPlatformKeysTest.*
+
+
+# Full screen button tests.
+-PresentationReceiverWindowViewBrowserTest.ChromeOSHardwareFullscreenButton
+
+# Service worker tests.
+-ServiceWorkerTestWithJSBindings/ServiceWorkerTest.SWServedBackgroundPageReceivesEvent/*
+
+# Shutdown policy tests.
+-ShutdownPolicyLockerTest.PolicyChange
+-ShutdownPolicyLockerTest.TestBasic
+
+# Sign-in extensions test.
+-SigninExtensionsDeviceCloudPolicyBrowserTest.InstallAndRunInWindow
+-SigninProfileAppsPolicyPerChannelTest.*
+-SigninProfileAppsPolicyTest.*
+
+# Clock policy tests.
+-SystemUse24HourClockPolicyTest.*
+
+# Unmanaged platform keys tests.
+-Unmanaged/UnmanagedPlatformKeysTest.*
+
+# Flaky tests. crbug.com/880584
+-UnifiedAutoplaySettingBrowserTest.*
+
+# Window Open API tests.  https://crbug.com/815379
+-WindowOpenApiTest.OpenLockedFullscreenWindow
+-WindowOpenApiTest.RemoveLockedFullscreenFromWindow
+-WindowOpenApiTest.RemoveLockedFullscreenFromWindowWithoutPermission
+-WindowOpenApiTest.UpdateWindowToLockedFullscreen
+-WindowOpenApiTest.VerifyCommandsInLockedFullscreen
+
+# Value of: immersive_controller->IsRevealed()
+-ZoomBubbleBrowserTest.ImmersiveFullscreen

testing/buildbot/filters/chromeos.single_process_mash.fyi.browser_tests.filter

-# These tests currently fail with SingleProcessMash enabled.
-# Bug: crbug.com/877118
-
-# --------------------------------------------------
-# Tests that are also blacklisted for Mash.
-# --------------------------------------------------
-
-# Extensive use of ash::WindowState.
--InitiallyMaximized/AcceleratorCommandsFullscreenBrowserTest.*
--InitiallyMaximized/AcceleratorCommandsPlatformAppFullscreenBrowserTest.*
--InitiallyRestored/AcceleratorCommandsFullscreenBrowserTest.*
--InitiallyRestored/AcceleratorCommandsPlatformAppFullscreenBrowserTest.*
-
-# Virtual keyboard not supported.
--DefaultKeyboardExtensionBrowserTest.*
--KeyboardEndToEndTest.*
--KioskVirtualKeyboardTest.*
--VirtualKeyboardAppWindowTest.*
--VirtualKeyboardStateTest.*
--VirtualKeyboardWebContentTest.*
-
-# AutomationManagerAura::Enable() uses ash to get active window. More generally,
-# chrome a11y code directly accesses ash system UI widgets and views.
--AutomationApiTest.*
--AutomationApiTestWithDeviceScaleFactor.*
--AutomationManagerAuraBrowserTest.*
-
-# The browser frame is a work in progress.
--BrowserNonClientFrameViewAshTest.AvatarDisplayOnTeleportedWindow/*
--BrowserNonClientFrameViewAshTest.HeaderHeightForSnappedBrowserInSplitView/*
--BrowserNonClientFrameViewAshTest.ImmersiveModeTopViewInset/*
--BrowserNonClientFrameViewAshTest.TopViewInset/*
-
-# Touch gestures don't work in webcontents. https://crbug.com/866991.
--TopControlsSlideControllerTest.DisplayRotation
--TopControlsSlideControllerTest.TestScrollingPage
--TopControlsSlideControllerTest.TestScrollingPageAndSwitchingToNTP
--TopControlsSlideControllerTest.TestClosingATab
--TopControlsSlideControllerTest.TestFocusEditableElements
-
-# Direct access to ash window frames, tablet mode, overview mode, etc.
--NonHomeLauncherBrowserNonClientFrameViewAshTest.*
-
-# Fix immersive fullscreen mode in mash. https://crbug.com/844748.
-# Needs EventGenerator to work across window tree hosts. crbug.com/814675
--ImmersiveModeBrowserViewTest.TestCaptionButtonsReceiveEventsInAppImmersiveMode*
--ImmersiveModeBrowserViewTest.TestCaptionButtonsReceiveEventsInBrowserImmersiveMode*
-
-# Need pixel copy support. http://crbug.com/754864 http://crbug.com/754872
--CastMirroringServiceHostBrowserTest.CaptureTabVideo
--CastStreamingApiTestWithPixelOutput.*
--TabCaptureApiPixelTest.*
-
-# RefCounted check failed: CalledOnValidSequence() from SchedulerWorkerDelegate::OnMainExit
--CheckSystemTokenAvailability/EnterprisePlatformKeysTest.*
-
-# aura::CrashInFlightChange::ChangeFailed() when searching PDF.
--ChromeFindRequestManagerTest.*
--PDFExtensionTest.*
--PDFExtensionHitTestTest.*
-
-# ash::Shell access for LogoutConfirmationController
--DeviceLocalAccountTest.*
-
-# Fails: immersive_controller->IsRevealed() returns false.
-# http://crbug.com/791148
--vZoomBubbleBrowserTest.*
-
-# ash::Shell::display_manager() to update displays.
-# http://crbug.com/831826
--PolicyDisplayRotationDefault/DisplayRotationDefaultTest.*
-
-# JS failure: hasAccessToCurrentWindow: FAIL (no message)
--LockScreenNoteTakingTest.*
-
-# desktop_window_tree_host_mus.cc(796) Check failed: !window->GetRootWindow() || this->window() == window->GetRootWindow().
--LoginFeedbackTest.*
-
-# Missing magnification manager and also RefCounted check failed:
-# CalledOnValidSequence() from SchedulerWorkerDelegate::OnMainExit
--LoginScreenDefaultPolicyLoginScreenBrowsertest.*
-
-# ash::Shell access in test for display configuration.
-# http://crbug.com/831826
--ShelfAppBrowserTest.LaunchAppFromDisplayWithoutFocus*
-
-# Timeout.
--StartupMetricsTest.*
-
-# Timeouts in content::WaitForChildFrameSurfaceReady()
-# Crashes in viz::HostFrameSinkManager::RegisterFrameSinkId()
-# http://crbug.com/755328
--WebViewTest.*
-
-# Needs EventGenerator to work across window tree hosts. crbug.com/814675
--RoundedOmniboxPopupContentsViewTest.ClickOmnibox*
-
-# RenderFrameMetadata observation not supported: https://crbug.com/820974
--WebViewFocusBrowserPluginSpecificTest.*
--WebViewScrollBubbling/WebViewGuestScrollTest.ScrollLatchingPreservedInGuests/*
--WebViewScrollBubbling/WebViewGuestScrollTouchTest.*
--WebViewScrollGuestContentBrowserPluginSpecificTest.OverscrollControllerSeesConsumedScrollsInGuest
--WebViewScrollBubbling/WebViewGuestScrollTest.TestGuestWheelScrollsBubble/*
-
-# FATAL:hit_test_region_observer.cc(164)] Check failed: frame_sink_id.is_valid().
--WebViewGuestTouchFocusBrowserPluginSpecificTest.TouchFocusesBrowserPluginInEmbedder
-
-# Picture-in-Picture does not work with mash because VideoSurfaceLayer is
-# disabled.
-# https://crbug.com/827327
--PictureInPictureWindowControllerBrowserTest.*
--ControlPictureInPictureWindowControllerBrowserTest.*
--BrowserActionApiTest.TestPictureInPictureOnBrowserActionIconClick
--PlatformAppBrowserTest.PictureInPicture
--PictureInPictureLazyBackgroundPageApiTest.PictureInPictureInBackgroundPage
-
-# These started failing with the switch to ws2.
-# https:://crbug.com/855767
--AppWindowApiTest.OnRestoredEvent
--BrowserActionApiTest.BrowserActionPopupWithIframe
--FirstRunUIBrowserTest.ModalWindowDoesNotBlock
--LauncherPlatformAppBrowserTest.AltNumberAppsTabbing
--LauncherPlatformAppBrowserTest.PackagedAppClickBehaviorInMinimizeMode
--LoginWebDialogTest.CannotMinimize
--LoginWebDialogTest.CloseDialogByAccelerator
--ShelfAppBrowserTest.AltNumberTabsTabbing
--ShelfAppBrowserTestNoDefaultBrowser.AltNumberBrowserTabbing
--ShelfAppBrowserTestNoDefaultBrowser.BrowserShortcutLauncherItemController
-
-# Excluded from Mash because pointer events from EventGenerator aren't seen.
-# https://crbug.com/814675
--ChromeOSInfoPrivateTest.StylusSeen
-
-# --------------------------------------------------
-# Tests failing only for SingleProcessMash.
-# --------------------------------------------------
-
-# Uses ash::WindowState in browser process.
--AcceleratorCommandsBrowserTest.ToggleMaximized
-
-# Crashes on exit, even without SingleProcessMash.
--AffiliationCheck/EnterpriseDeviceAttributesTest.Success/*
-
-# Flaky tests. crbug.com/880584
--AutoplayMetricsBrowserTest.RecordAutoplayAttemptUkm
-
-# Blub Arc tests.
--Blub/UnaffiliatedArcAllowedTest.ProfileTest/0
--Blub/UnaffiliatedArcAllowedTest.ProfileTest/1
-
-# Browser command controller tests.
--BrowserCommandControllerBrowserTest.LockedFullscreen
-
-# Enterprise keys tests.
--CheckSystemTokenAvailability/EnterprisePlatformKeysTest.Basic/*
-
-# Ash native views tests.
--ChromeNativeAppWindowViewsAuraAshBrowserTest.*
-
-# Context menu tests.
--ContextMenuBrowserTest.ContextMenuEntriesAreDisabledInLockedFullscreen
-
-# Default extension tests.
--DefaultProfileExtensionBrowserTest.NoExtensionHosts
-
-# Immersive mode tests.
--ImmersiveModeBrowserViewTest.TabNavigationAcceleratorsFullscreenBrowser/material
-
-# Lock screen tests.
--LockScreenNoteTakingTest.Launch
-
-# Login screen tests.
--LoginScreenPolicyTest.DisableSupervisedUsers
-
-# PRE steps crash on shutdown.
-# FATAL:ref_counted.h(85)] Check failed: CalledOnValidSequence()
--ManagedWithoutPermission/ManagedWithoutPermissionPlatformKeysTest.*
--ManagedWithPermission/ManagedWithPermissionPlatformKeysTest.*
-
-# Flaky tests. crbug.com/880584
--MSE_ClearKey/EncryptedMediaTest.Playback_Multiple_VideoAudio_WebM/*
--MSE_ExternalClearKey/EncryptedMediaTest.Playback_Multiple_VideoAudio_WebM/*
-
-# Full screen button tests.
--PresentationReceiverWindowViewBrowserTest.ChromeOSHardwareFullscreenButton
-
-# Service worker tests.
--ServiceWorkerTestWithJSBindings/ServiceWorkerTest.SWServedBackgroundPageReceivesEvent/*
-
-# Shutdown policy tests.
--ShutdownPolicyLockerTest.PolicyChange
--ShutdownPolicyLockerTest.TestBasic
-
-# Sign-in extensions test.
--SigninExtensionsDeviceCloudPolicyBrowserTest.InstallAndRunInWindow
--SigninProfileAppsPolicyPerChannelTest.*
--SigninProfileAppsPolicyTest.*
-
-# Clock policy tests.
--SystemUse24HourClockPolicyTest.*
-
-# Unmanaged platform keys tests.
--Unmanaged/UnmanagedPlatformKeysTest.*
-
-# Flaky tests. crbug.com/880584
--UnifiedAutoplaySettingBrowserTest.*
-
-# Window Open API tests.  https://crbug.com/815379
--WindowOpenApiTest.OpenLockedFullscreenWindow
--WindowOpenApiTest.RemoveLockedFullscreenFromWindow
--WindowOpenApiTest.RemoveLockedFullscreenFromWindowWithoutPermission
--WindowOpenApiTest.UpdateWindowToLockedFullscreen
--WindowOpenApiTest.VerifyCommandsInLockedFullscreen
-
-# Value of: immersive_controller->IsRevealed()
--ZoomBubbleBrowserTest.ImmersiveFullscreen

testing/buildbot/test_suites.pyl

@@ -1749,75 +1749,6 @@
     },
   },
 
-  'single_process_mash_fyi_chromium_gtests': {
-    'single_process_mash_fyi_browser_tests': {
-      'test': 'browser_tests',
-      'args': [
-        '--enable-features=SingleProcessMash',
-        '--override-use-software-gl-for-tests',
-        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.fyi.browser_tests.filter',
-      ],
-      'swarming': {
-        'hard_timeout': 1800,
-        'shards': 10,
-      },
-    },
-    'single_process_mash_fyi_ash_unittests': {
-      'test': 'ash_unittests',
-      'args': [
-        '--enable-features=SingleProcessMash',
-        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.fyi.ash_unittests.filter',
-      ],
-    },
-    'single_process_mash_fyi_exo_unittests': {
-      'test': 'exo_unittests',
-      'args': [
-        '--enable-features=SingleProcessMash',
-        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.fyi.exo_unittests.filter',
-      ],
-    },
-  },
-
-  # These can be folded into linux_chromeos_specific_gtests once we stop moving
-  # tests around on the main waterfall.
-  'mash_chromium_gtests' : {
-    'mash_browser_tests': {
-      'test': 'browser_tests',
-      'args': [
-        '--enable-features=Mash',
-        '--override-use-software-gl-for-tests',
-        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.mash.browser_tests.filter',
-      ],
-      'swarming': {
-        'hard_timeout': 1800,
-        'shards': 1,
-      },
-    },
-  },
-
-  # These can be folded into linux_chromeos_specific_gtests once we stop moving
-  # tests around on the main waterfall.
-  'single_process_mash_chromium_gtests': {
-    'single_process_mash_browser_tests': {
-      'test': 'browser_tests',
-      'args': [
-        '--enable-features=SingleProcessMash',
-        '--override-use-software-gl-for-tests',
-        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter',
-      ],
-      'swarming': {
-        'hard_timeout': 1800,
-        'shards': 10,
-      },
-    },
-    'single_process_mash_content_unittests': {
-      'test': 'content_unittests',
-      'args': [
-        '--enable-features=SingleProcessMash',
-      ],
-    },
-  },
-
   'memory_infra_isolated_scripts': {
     'heap_profiling.mobile': {
       'args': [
@@ -1933,6 +1864,18 @@
     'exo_unittests': {},
     'gl_unittests_ozone': {},
     'keyboard_unittests': {},
+    'mash_browser_tests': {
+      'test': 'browser_tests',
+      'args': [
+        '--enable-features=Mash',
+        '--override-use-software-gl-for-tests',
+        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.mash.browser_tests.filter',
+      ],
+      'swarming': {
+        'hard_timeout': 1800,
+        'shards': 1,
+      },
+    },
     'ozone_gl_unittests': {
       'args': [
         '--ozone-platform=headless',
@@ -1941,6 +1884,38 @@
     'ozone_unittests': {},
     'ozone_x11_unittests': {},
     'select_to_speak_extension_tests': {},
+    'single_process_mash_ash_unittests': {
+      'test': 'ash_unittests',
+      'args': [
+        '--enable-features=SingleProcessMash',
+        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.ash_unittests.filter',
+      ],
+    },
+    'single_process_mash_browser_tests': {
+      'test': 'browser_tests',
+      'args': [
+        '--enable-features=SingleProcessMash',
+        '--override-use-software-gl-for-tests',
+        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.browser_tests.filter',
+      ],
+      'swarming': {
+        'hard_timeout': 1800,
+        'shards': 10,
+      },
+    },
+    'single_process_mash_content_unittests': {
+      'test': 'content_unittests',
+      'args': [
+        '--enable-features=SingleProcessMash',
+      ],
+    },
+    'single_process_mash_exo_unittests': {
+      'test': 'exo_unittests',
+      'args': [
+        '--enable-features=SingleProcessMash',
+        '--test-launcher-filter-file=../../testing/buildbot/filters/chromeos.single_process_mash.exo_unittests.filter',
+      ],
+    },
     'ui_chromeos_unittests': {},
     'views_mus_unittests': {},
     'views_mus_interactive_ui_tests': {},
@@ -2383,8 +2358,6 @@
     'chromium_gtests_for_linux_and_chromeos_only',
     'linux_chromeos_specific_gtests',
     'linux_flavor_specific_chromium_gtests',
-    'single_process_mash_chromium_gtests',
-    'mash_chromium_gtests',
     'non_android_chromium_gtests',
     'viz_chromeos_gtests',
     'viz_gtests',
@@ -2713,7 +2686,6 @@
   'mojo_chromiumos_fyi_gtests': [
     'aura_gtests',
     'mash_fyi_chromium_gtests',
-    'single_process_mash_fyi_chromium_gtests',
     'mojo_chromiumos_specific_gtests',
     'viz_gtests',
     'viz_non_android_fyi_gtests',