Commit 30faf35a authored by Maksim Sisov's avatar Maksim Sisov Committed by Commit Bot

X11 and Ozone: Disable some X11 tests

They are X11 specific. Disable them for ozone now. In the future,
we need to make them work with Ozone/X11. It seems to be easy
to do by switching to use WidgetActivationWaiter, but
Ozone/Wayland doesn't support activation/deactivation for
windows. We either need to make that work or let test
know the platform so that the test isn't run.

Alternatively, these tests can be moved to x11_unittests.

Bug: 1085700
Change-Id: Ic1333dfec1dea8ba6ad0a3beb8dc224ba435ca23
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2367059Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#800474}
parent aa859df6
......@@ -525,6 +525,9 @@ TEST_F(DesktopWindowTreeHostLinuxTest,
// Chrome even if it not possible to deactivate the window wrt to the x server.
// This behavior is required by several interactive_ui_tests.
TEST_F(DesktopWindowTreeHostLinuxTest, Deactivate) {
// TODO(1109112): enable this test.
if (features::IsUsingOzonePlatform())
GTEST_SKIP();
std::unique_ptr<Widget> widget(CreateWidget(gfx::Rect(100, 100, 100, 100)));
ActivationWaiter waiter(static_cast<x11::Window>(
......@@ -550,6 +553,9 @@ TEST_F(DesktopWindowTreeHostLinuxTest, Deactivate) {
// Chrome synchronously switches the window that mouse events are forwarded to
// when capture is changed.
TEST_F(DesktopWindowTreeHostLinuxTest, CaptureEventForwarding) {
// TODO(1109112): enable this test.
if (features::IsUsingOzonePlatform())
GTEST_SKIP();
std::unique_ptr<Widget> widget1(CreateWidget(gfx::Rect(100, 100, 100, 100)));
aura::Window* window1 = widget1->GetNativeWindow();
DesktopWindowTreeHostLinux* host1 =
......@@ -624,6 +630,9 @@ TEST_F(DesktopWindowTreeHostLinuxTest, CaptureEventForwarding) {
}
TEST_F(DesktopWindowTreeHostLinuxTest, InputMethodFocus) {
// TODO(1109112): enable this test.
if (features::IsUsingOzonePlatform())
GTEST_SKIP();
std::unique_ptr<Widget> widget(CreateWidget(gfx::Rect(100, 100, 100, 100)));
// Waiter should be created as early as possible so that PropertyNotify has
......
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