Commit 0166803a authored by kylechar's avatar kylechar Committed by Commit bot

Get mus_ws_unittests working with Ozone X11.

WindowServerTests need a TYPE_UI message loop to work with libevent for
Ozone X11. Luckily, there is already a virtual function in ServiceTest
to create a MessageLoop.

Other Changes:
- Switch mus_ws_unittests to run with Ozone X11
- Add media_service_unittests to CQ trybot instead of FYI trybot.
- Delete tests from FYI trybot that run on CQ trybot.

BUG=664570

Review-Url: https://codereview.chromium.org/2661163006
Cr-Commit-Position: refs/heads/master@{#448049}
parent 230f8e30
......@@ -353,6 +353,12 @@ class WindowServerTest : public WindowServerTestBase {
EXPECT_TRUE(WindowServerTestBase::QuitRunLoop());
}
// mojo::test::ServiceTest::
std::unique_ptr<base::MessageLoop> CreateMessageLoop() override {
// The window server is expected to run with a TYPE_UI message loop.
return base::MakeUnique<base::MessageLoop>(base::MessageLoop::TYPE_UI);
}
std::unique_ptr<EmbedDetails> embed_details_;
std::unique_ptr<ClientAreaChange> client_area_change_;
......
......@@ -246,6 +246,12 @@
},
"test": "media_blink_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "media_service_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
......@@ -271,9 +277,6 @@
"test": "mus_demo_unittests"
},
{
"args": [
"--ozone-platform=headless"
],
"swarming": {
"can_use_on_swarming_builders": true
},
......
......@@ -11368,27 +11368,6 @@
"can_use_on_swarming_builders": false
},
"test": "browser_tests"
},
{
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "media_service_unittests"
},
{
"args": [
"--ozone-platform=headless"
],
"swarming": {
"can_use_on_swarming_builders": false
},
"test": "mus_ws_unittests"
},
{
"swarming": {
"can_use_on_swarming_builders": true
},
"test": "views_mus_unittests"
}
]
},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment