Flakiness in SingleClientPrintersSyncTest.EditPrinter

chrome/browser/sync/test/integration/single_client_printers_sync_test.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "chrome/browser/sync/test/integration/printers_helper.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h"
@@ skipping 35 matching lines @@
   AddPrinter(GetVerifierPrinterStore(), printers_helper::CreateTestPrinter(0));
   ASSERT_EQ(1, GetPrinterCount(0));
   ASSERT_EQ(1, GetVerifierPrinterCount());
 
   ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());
   EXPECT_EQ(1, GetVerifierPrinterCount());
   EXPECT_TRUE(ProfileContainsSamePrintersAsVerifier(0));
 }
 
 // Verify editing a printer doesn't add it.
-// Flaky on ChromeOS. http://crbug.com/701999
-#if defined(OS_CHROMEOS)
-#define MAYBE_EditPrinter DISABLED_EditPrinter
-#else
-#define MAYBE_EditPrinter EditPrinter
-#endif
-IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, MAYBE_EditPrinter) {
+IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, EditPrinter) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
+  // Wait for sync service initialization before proceeding.

[skym, 2017/03/16 23:41:00]

It concerns me that this is needed, and that you're not adding it to any of the
other tests. Seems like an issue with all ModelTypeStore backed types, including
all of your other test cases.

[skau, 2017/03/18 00:04:55]

I've moved it into SetupSync so it's used in the other tests.  You are correct
that the other tests risk being flaky as well.

+  ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());
+
   AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0));
   AddPrinter(GetVerifierPrinterStore(), printers_helper::CreateTestPrinter(0));
 
   ASSERT_TRUE(
       EditPrinterDescription(GetPrinterStore(0), 0, "Updated description"));
 
   EXPECT_EQ(1, GetPrinterCount(0));
   EXPECT_EQ(1, GetVerifierPrinterCount());
   EXPECT_FALSE(ProfileContainsSamePrintersAsVerifier(0));
 }
@@ skipping 17 matching lines @@
 #define MAYBE_AddBeforeSetup AddBeforeSetup
 #endif
 IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, MAYBE_AddBeforeSetup) {
   ASSERT_TRUE(SetupClients());
 
   AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0));
   EXPECT_EQ(1, GetPrinterCount(0));
 
   EXPECT_TRUE(SetupSync()) << "SetupSync() failed.";
 }