From f651e18685460fe8d914727d34f704c0649cb090 Mon Sep 17 00:00:00 2001 From: kjellander Date: Tue, 7 Oct 2014 04:08:44 -0700 Subject: [PATCH] Revert of Disable TwoClientSessionsSyncTest.SingleClientEnabledEncryptionAndChanged on Linux. (patchset #3 id:40001 of https://codereview.chromium.org/634873002/) Reason for revert: I disabled the wrong test (same name). The right test to be disabled is handled in https://codereview.chromium.org/637513002/. Original issue's description: > Disable TwoClientSessionsSyncTest.SingleClientEnabledEncryptionAndChanged on Linux. > > In sync_integration_tests this test started failing at > https://build.chromium.org/p/chromium.linux/builders/Linux%20Tests/builds/14440 > and has been flaky ever since. > > NOTRY=true > BUG=420979 > TBR=zea@chromium.org > > Committed: https://crrev.com/17d75d0075174e088c1b4e1009d772c209ef230d > Cr-Commit-Position: refs/heads/master@{#298426} TBR=zea@chromium.org NOTREECHECKS=true NOTRY=true BUG=420979 Review URL: https://codereview.chromium.org/638563002 Cr-Commit-Position: refs/heads/master@{#298443} --- .../sync/test/integration/two_client_bookmarks_sync_test.cc | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc index 6c8689f11f3f..0bb840cb8ef9 100644 --- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc @@ -1820,16 +1820,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, ASSERT_TRUE(AllModelsMatchVerifier()); } -// Flaky on Linux: http://crbug.com/420979. -#if defined(OS_LINUX) -#define MAYBE_SingleClientEnabledEncryptionAndChanged \ - DISABLED_SingleClientEnabledEncryptionAndChanged -#else -#define MAYBE_SingleClientEnabledEncryptionAndChanged \ - SingleClientEnabledEncryptionAndChanged -#endif IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, - MAYBE_SingleClientEnabledEncryptionAndChanged) { + SingleClientEnabledEncryptionAndChanged) { ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; ASSERT_TRUE(AllModelsMatchVerifier()); -- 2.11.4.GIT