Commit 7059913e authored by Mikel Astiz's avatar Mikel Astiz Committed by Commit Bot

Enable more EnableDisableSingleClientTest tests

These tests were believed to be failing or be flaky, but I could
not reproduce the failures locally, presumably due to recent
improvements in https://chromium-review.googlesource.com/1111716

As it seems, DataTypeManagerImpl's mechanism to defer
reconfigurations via |needs_reconfigure_| is sufficient to handle
fast enable-disable-enable sequences.

Bug: 855375
Change-Id: Iec677202f9db15787da1a62345e09852e84a9f79
Reviewed-on: https://chromium-review.googlesource.com/1111844
Commit-Queue: Mikel Astiz <mastiz@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570137}
parent 35fab120
......@@ -250,9 +250,8 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest,
}
}
// Disabled as per crbug.com/854446.
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest,
DISABLED_FastEnableDisableEnableOneAtATime) {
FastEnableDisableEnableOneAtATime) {
// Setup sync with no enabled types.
SetupTest(/*all_types_enabled=*/false);
......@@ -296,9 +295,7 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, EnableDisable) {
}
}
// Disabled as per crbug.com/854446.
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest,
DISABLED_FastEnableDisableEnable) {
IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest, FastEnableDisableEnable) {
SetupTest(/*all_types_enabled=*/false);
// Enable all, and then disable+reenable immediately afterwards, before
......@@ -308,7 +305,11 @@ IN_PROC_BROWSER_TEST_F(EnableDisableSingleClientTest,
GetClient(0)->DisableSyncForAllDatatypes();
GetClient(0)->EnableSyncForAllDatatypes();
for (ModelTypeSet::Iterator si = selectable_types_.First(); si.Good();
// Proxy types don't really run.
const ModelTypeSet non_proxy_types =
Difference(selectable_types_, ProxyTypes());
for (ModelTypeSet::Iterator si = non_proxy_types.First(); si.Good();
si.Inc()) {
EXPECT_TRUE(ModelTypeExists(si.Get()))
<< " for " << ModelTypeToString(si.Get());
......
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