summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorbrucedawson <brucedawson@chromium.org>2015-09-18 17:27:02 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-19 00:27:42 +0000
commit7f847477cdd4f1f297eb5f17dc0fba9e12b00a92 (patch)
treeaf625b9ccb5efb4dda3e05cc2f7067d1920166dd /base
parentaa3acf2cdddec3e9677e1b692bd7d3f084c22c00 (diff)
downloadchromium_src-7f847477cdd4f1f297eb5f17dc0fba9e12b00a92.zip
chromium_src-7f847477cdd4f1f297eb5f17dc0fba9e12b00a92.tar.gz
chromium_src-7f847477cdd4f1f297eb5f17dc0fba9e12b00a92.tar.bz2
Disable EtwTraceControllerTest.EnableDisable
This test is hanging on some Windows 7 machines and the fix is not obvious. Disabling while I investigate. R=danakj@chromium.org BUG=525297 Review URL: https://codereview.chromium.org/1358583004 Cr-Commit-Position: refs/heads/master@{#349818}
Diffstat (limited to 'base')
-rw-r--r--base/win/event_trace_controller_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/base/win/event_trace_controller_unittest.cc b/base/win/event_trace_controller_unittest.cc
index 1236c89..9a57041 100644
--- a/base/win/event_trace_controller_unittest.cc
+++ b/base/win/event_trace_controller_unittest.cc
@@ -179,7 +179,8 @@ TEST_F(EtwTraceControllerTest, StartFileSession) {
base::DeleteFile(temp, false);
}
-TEST_F(EtwTraceControllerTest, EnableDisable) {
+// Disable until bug 525297 is fixed (hangs on Windows 7?)
+TEST_F(EtwTraceControllerTest, DISABLE_EnableDisable) {
TestingProvider provider(test_provider_);
EXPECT_EQ(ERROR_SUCCESS, provider.Register());