chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc - Issue 6689014: GTTF: Detect browser crashes on shutdown in UI tests.

Side by Side Diff: chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc

Issue 6689014: GTTF: Detect browser crashes on shutdown in UI tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 9 years, 8 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

« no previous file with comments | « chrome/test/automation/proxy_launcher.cc ('k') | chrome/test/out_of_proc_test_runner.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 "base/file_path.h"	5 #include "base/file_path.h"

6 #include "chrome/app/chrome_command_ids.h"	6 #include "chrome/app/chrome_command_ids.h"

7 #include "chrome/browser/ui/view_ids.h"	7 #include "chrome/browser/ui/view_ids.h"

8 #include "chrome/test/automation/automation_proxy.h"	8 #include "chrome/test/automation/automation_proxy.h"

9 #include "chrome/test/automation/browser_proxy.h"	9 #include "chrome/test/automation/browser_proxy.h"

10 #include "chrome/test/automation/tab_proxy.h"	10 #include "chrome/test/automation/tab_proxy.h"

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47 // Close the tab, removing the one and only before unload handler.	47 // Close the tab, removing the one and only before unload handler.

48 scoped_refptr<TabProxy> tab(browser->GetTab(1));	48 scoped_refptr<TabProxy> tab(browser->GetTab(1));

49 ASSERT_TRUE(tab->Close(true));	49 ASSERT_TRUE(tab->Close(true));

50	50

51 // Close the browser. We should launch the unload handler, which is an	51 // Close the browser. We should launch the unload handler, which is an

52 // alert().	52 // alert().

53 ASSERT_TRUE(browser->ApplyAccelerator(IDC_CLOSE_WINDOW));	53 ASSERT_TRUE(browser->ApplyAccelerator(IDC_CLOSE_WINDOW));

54 ASSERT_TRUE(automation()->WaitForAppModalDialog());	54 ASSERT_TRUE(automation()->WaitForAppModalDialog());

55 ASSERT_TRUE(automation()->ClickAppModalDialogButton(	55 ASSERT_TRUE(automation()->ClickAppModalDialogButton(

56 ui::MessageBoxFlags::DIALOGBUTTON_OK));	56 ui::MessageBoxFlags::DIALOGBUTTON_OK));

57 ASSERT_TRUE(WaitForBrowserProcessToQuit(	57

58 TestTimeouts::wait_for_terminate_timeout_ms()));	58 int exit_code = -1;

	59 ASSERT_TRUE(launcher_->WaitForBrowserProcessToQuit(

	60 TestTimeouts::wait_for_terminate_timeout_ms(), &exit_code));
	Huyen 2011/04/07 00:07:45 Pawel, I think you forgot to include test_timeouts Pawel, I think you forgot to include test_timeouts.h. I tried to build all target and I'm getting an error: chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc: In member function ‘virtual void FastShutdown_SlowTermination_Test::TestBody()’: chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc:59: error: ‘TestTimeouts’ was not declared in this scope Paweł Hajdan Jr. 2011/04/07 06:25:19 Thank you for commenting here. I took a look at th Show quoted text On 2011/04/07 00:07:45, Huyen wrote: > Pawel, I think you forgot to include test_timeouts.h. I tried to build all > target and I'm getting an error: > > chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc: In member > function ‘virtual void FastShutdown_SlowTermination_Test::TestBody()’: > chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc:59: error: > ‘TestTimeouts’ was not declared in this scope Thank you for commenting here. I took a look at the side-by-side diff, and TestTimeouts was used here before. Also, the change landed successfully on the waterfall, which suggests it didn't introduce a compile failure. Do you have any local changes that could make this fail to compile? I agree though that test_timeouts.h should be explicitly #included here. Feel free to TBR such a change to me.
	61 EXPECT_EQ(0, exit_code); // Expect a clean shutdown.

59 }	62 }

OLD	NEW