summaryrefslogtreecommitdiffstats
path: root/chrome/browser/performance_monitor
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-02 18:12:35 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-02 18:12:35 +0000
commit0e37af7dc5bcaec2b2b901462149bfcb71037c0f (patch)
treed8282351b38c826f2ce38530ef17f0d6a23e9aab /chrome/browser/performance_monitor
parent07ea9f9c8c0f5663908cdafe671db14dd221e006 (diff)
downloadchromium_src-0e37af7dc5bcaec2b2b901462149bfcb71037c0f.zip
chromium_src-0e37af7dc5bcaec2b2b901462149bfcb71037c0f.tar.gz
chromium_src-0e37af7dc5bcaec2b2b901462149bfcb71037c0f.tar.bz2
Disable PerformanceMonitorBrowserTest.RendererKilledEvent because it is flkay
NOTRY=TRUE BUG=159172 Review URL: https://chromiumcodereview.appspot.com/11275129 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165705 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/performance_monitor')
-rw-r--r--chrome/browser/performance_monitor/performance_monitor_browsertest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
index 44d19e3..eb873c9 100644
--- a/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
+++ b/chrome/browser/performance_monitor/performance_monitor_browsertest.cc
@@ -593,12 +593,14 @@ IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, GatherStatistics) {
EXPECT_GT(stats[1].value, 0);
}
+// Disabled on other platforms because of flakiness: http://crbug.com/159172.
#if !defined(OS_WIN)
// Disabled on Windows due to a bug where Windows will return a normal exit
// code in the testing environment, even if the process died (this is not the
// case when hand-testing). This code can be traced to MSDN functions in
// base::GetTerminationStatus(), so there's not much we can do.
-IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest, RendererKilledEvent) {
+IN_PROC_BROWSER_TEST_F(PerformanceMonitorBrowserTest,
+ DISABLED_RendererKilledEvent) {
content::CrashTab(chrome::GetActiveWebContents(browser()));
Database::EventVector events = GetEvents();