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

Unified Diff: ui/views/controls/menu/menu_runner_cocoa_unittest.mm

Issue 2094193002: Deflake Mac views_unittest's MenuRunnerCocoaTest.RunMenuAndCancel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 side-by-side diff with in-line comments
Download patch
« ui/events/base_event_utils.cc ('K') | « ui/events/base_event_utils.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_runner_cocoa_unittest.mm
diff --git a/ui/views/controls/menu/menu_runner_cocoa_unittest.mm b/ui/views/controls/menu/menu_runner_cocoa_unittest.mm
index 0b145556efecf4ecf87ad2ffc54a1050cda18e65..f7c1ccd907b3ea0b741a15c6cc75f09e697f7235 100644
--- a/ui/views/controls/menu/menu_runner_cocoa_unittest.mm
+++ b/ui/views/controls/menu/menu_runner_cocoa_unittest.mm
@@ -169,6 +169,7 @@ class MenuRunnerCocoaTest : public ViewsTestBase {
};
TEST_F(MenuRunnerCocoaTest, RunMenuAndCancel) {
+ g_no_mock_time = true;
base::TimeDelta min_time = (ui::EventTimeForNow() - base::TimeTicks());
MenuRunner::RunResult result = RunMenu(base::Bind(
@@ -184,6 +185,8 @@ TEST_F(MenuRunnerCocoaTest, RunMenuAndCancel) {
// Cancel again.
runner_->Cancel();
EXPECT_FALSE(runner_->IsRunning());
+
+ g_no_mock_time = false;
}
TEST_F(MenuRunnerCocoaTest, RunMenuAndDelete) {
« ui/events/base_event_utils.cc ('K') | « ui/events/base_event_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698