Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc

Issue 417453002: Disable all the tests that are flaking more than 5% on Linux builders. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <vector> 5 #include <vector>
6 6
7 #include <X11/extensions/shape.h> 7 #include <X11/extensions/shape.h>
8 #include <X11/Xlib.h> 8 #include <X11/Xlib.h>
9 9
10 // Get rid of X11 macros which conflict with gtest. 10 // Get rid of X11 macros which conflict with gtest.
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 465
466 WMStateWaiter waiter(xid, "_NET_WM_STATE_FOCUSED", true); 466 WMStateWaiter waiter(xid, "_NET_WM_STATE_FOCUSED", true);
467 waiter.Wait(); 467 waiter.Wait();
468 } 468 }
469 EXPECT_TRUE(widget.GetNativeWindow()->IsVisible()); 469 EXPECT_TRUE(widget.GetNativeWindow()->IsVisible());
470 } 470 }
471 471
472 // Test that calling Widget::Deactivate() sets the widget as inactive wrt to 472 // Test that calling Widget::Deactivate() sets the widget as inactive wrt to
473 // Chrome even if it not possible to deactivate the window wrt to the x server. 473 // Chrome even if it not possible to deactivate the window wrt to the x server.
474 // This behavior is required by several interactive_ui_tests. 474 // This behavior is required by several interactive_ui_tests.
475 TEST_F(DesktopWindowTreeHostX11Test, Deactivate) { 475 // http://crbug.com/396491
476 TEST_F(DesktopWindowTreeHostX11Test, DISABLED_Deactivate) {
476 scoped_ptr<Widget> widget(CreateWidget(NULL)); 477 scoped_ptr<Widget> widget(CreateWidget(NULL));
477 478
478 ActivationWaiter waiter( 479 ActivationWaiter waiter(
479 widget->GetNativeWindow()->GetHost()->GetAcceleratedWidget()); 480 widget->GetNativeWindow()->GetHost()->GetAcceleratedWidget());
480 widget->Show(); 481 widget->Show();
481 widget->Activate(); 482 widget->Activate();
482 waiter.Wait(); 483 waiter.Wait();
483 484
484 widget->Deactivate(); 485 widget->Deactivate();
485 // Regardless of whether |widget|'s X11 window eventually gets deactivated, 486 // Regardless of whether |widget|'s X11 window eventually gets deactivated,
486 // |widget|'s "active" state should change. 487 // |widget|'s "active" state should change.
487 EXPECT_FALSE(widget->IsActive()); 488 EXPECT_FALSE(widget->IsActive());
488 489
489 // |widget|'s X11 window should still be active. Reactivating |widget| should 490 // |widget|'s X11 window should still be active. Reactivating |widget| should
490 // update the widget's "active" state. 491 // update the widget's "active" state.
491 // Note: Activating a widget whose X11 window is not active does not 492 // Note: Activating a widget whose X11 window is not active does not
492 // synchronously update the widget's "active" state. 493 // synchronously update the widget's "active" state.
493 widget->Activate(); 494 widget->Activate();
494 EXPECT_TRUE(widget->IsActive()); 495 EXPECT_TRUE(widget->IsActive());
495 } 496 }
496 497
497 } // namespace views 498 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698