diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 18:55:30 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 18:55:30 +0000 |
| commit | d166d83f63ff4b74610dfe4d10c6e6d7250e0d03 (patch) | |
| tree | 843da73da9228499bf88063490fba73845740740 /base/trace_event_win_unittest.cc | |
| parent | 310a5b44afee9d63c37780b60c9260918b46b553 (diff) | |
| download | chromium_src-d166d83f63ff4b74610dfe4d10c6e6d7250e0d03.zip chromium_src-d166d83f63ff4b74610dfe4d10c6e6d7250e0d03.tar.gz chromium_src-d166d83f63ff4b74610dfe4d10c6e6d7250e0d03.tar.bz2 | |
Revert 62766 - Fix event tracing for windows test flakyness.
Assert on non-null properties to the static members of the trace controller.
Fix usage of same.
Add a PostEventsDisabled method to trace producer to which allows for a non-racy enable/disable test.
BUG=52388
BUG=59328
TEST=Unittests in the change.
Review URL: http://codereview.chromium.org/3800006
TBR=siggi@chromium.org
Review URL: http://codereview.chromium.org/3815008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62767 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/trace_event_win_unittest.cc')
| -rw-r--r-- | base/trace_event_win_unittest.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/base/trace_event_win_unittest.cc b/base/trace_event_win_unittest.cc index 1335bed..a142af1 100644 --- a/base/trace_event_win_unittest.cc +++ b/base/trace_event_win_unittest.cc @@ -79,13 +79,6 @@ class TraceEventTest: public testing::Test { void SetUp() { bool is_xp = base::win::GetVersion() < base::win::VERSION_VISTA; - if (is_xp) { - // Tear down any dangling session from an earlier failing test. - EtwTraceProperties ignore; - - EtwTraceController::Stop(kTestSessionName, &ignore); - } - // Resurrect and initialize the TraceLog singleton instance. // On Vista and better, we need the provider registered before we // start the private, in-proc session, but on XP we need the global @@ -261,7 +254,8 @@ TEST_F(TraceEventTest, TraceLog) { PlayLog(); } -TEST_F(TraceEventTest, Macros) { +// Marked flaky per http://crbug.com/52388 +TEST_F(TraceEventTest, FLAKY_Macros) { ExpectPlayLog(); // The events should arrive in the same sequence as the expects. |