Commit 3d336555 authored by Erik Chen's avatar Erik Chen Committed by Commit Bot

Re-enable memlog tests on CrOS.

Flakiness should be fixed by https://chromium-review.googlesource.com/1023716.

Bug: 835826
Change-Id: I2f66c96439c10f0c6d115060006c2dc8523de103
Reviewed-on: https://chromium-review.googlesource.com/1028175Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Commit-Queue: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553569}
parent 2204ed53
......@@ -76,15 +76,9 @@ class MemlogBrowserTest : public InProcessBrowserTest,
}
};
// Disabled due to https://crbug.com/835826.
#if defined(OS_CHROMEOS)
#define MAYBE_EndToEnd DISABLED_EndToEnd
#else
#define MAYBE_EndToEnd EndToEnd
#endif
// Ensure invocations via TracingController can generate a valid JSON file with
// expected data.
IN_PROC_BROWSER_TEST_P(MemlogBrowserTest, MAYBE_EndToEnd) {
IN_PROC_BROWSER_TEST_P(MemlogBrowserTest, EndToEnd) {
LOG(INFO) << "Memlog mode: " << static_cast<int>(GetParam().mode);
LOG(INFO) << "Memlog stack mode: " << static_cast<int>(GetParam().stack_mode);
LOG(INFO) << "Started via command line flag: "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment