Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1079)

Side by Side Diff: chrome/browser/sync/test/integration/single_client_printers_sync_test.cc

Issue 2755923002: Disable flaky SingleClientPrintersSyncTest.EditPrinter on ChromeOS. (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/macros.h" 7 #include "base/macros.h"
8 #include "chrome/browser/sync/test/integration/printers_helper.h" 8 #include "chrome/browser/sync/test/integration/printers_helper.h"
9 #include "chrome/browser/sync/test/integration/sync_test.h" 9 #include "chrome/browser/sync/test/integration/sync_test.h"
10 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h " 10 #include "chrome/browser/sync/test/integration/updated_progress_marker_checker.h "
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 AddPrinter(GetVerifierPrinterStore(), printers_helper::CreateTestPrinter(0)); 46 AddPrinter(GetVerifierPrinterStore(), printers_helper::CreateTestPrinter(0));
47 ASSERT_EQ(1, GetPrinterCount(0)); 47 ASSERT_EQ(1, GetPrinterCount(0));
48 ASSERT_EQ(1, GetVerifierPrinterCount()); 48 ASSERT_EQ(1, GetVerifierPrinterCount());
49 49
50 ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait()); 50 ASSERT_TRUE(UpdatedProgressMarkerChecker(GetSyncService(0)).Wait());
51 EXPECT_EQ(1, GetVerifierPrinterCount()); 51 EXPECT_EQ(1, GetVerifierPrinterCount());
52 EXPECT_TRUE(ProfileContainsSamePrintersAsVerifier(0)); 52 EXPECT_TRUE(ProfileContainsSamePrintersAsVerifier(0));
53 } 53 }
54 54
55 // Verify editing a printer doesn't add it. 55 // Verify editing a printer doesn't add it.
56 IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, EditPrinter) { 56 // Flaky on ChromeOS. http://crbug.com/701999
57 #if defined(OS_CHROMEOS)
58 #define MAYBE_EditPrinter DISABLED_EditPrinter
59 #else
60 #define MAYBE_EditPrinter EditPrinter
61 #endif
62 IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, MAYBE_EditPrinter) {
57 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 63 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
58 64
59 AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0)); 65 AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0));
60 AddPrinter(GetVerifierPrinterStore(), printers_helper::CreateTestPrinter(0)); 66 AddPrinter(GetVerifierPrinterStore(), printers_helper::CreateTestPrinter(0));
61 67
62 ASSERT_TRUE( 68 ASSERT_TRUE(
63 EditPrinterDescription(GetPrinterStore(0), 0, "Updated description")); 69 EditPrinterDescription(GetPrinterStore(0), 0, "Updated description"));
64 70
65 EXPECT_EQ(1, GetPrinterCount(0)); 71 EXPECT_EQ(1, GetPrinterCount(0));
66 EXPECT_EQ(1, GetVerifierPrinterCount()); 72 EXPECT_EQ(1, GetVerifierPrinterCount());
(...skipping 19 matching lines...) Expand all
86 #define MAYBE_AddBeforeSetup AddBeforeSetup 92 #define MAYBE_AddBeforeSetup AddBeforeSetup
87 #endif 93 #endif
88 IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, MAYBE_AddBeforeSetup) { 94 IN_PROC_BROWSER_TEST_F(SingleClientPrintersSyncTest, MAYBE_AddBeforeSetup) {
89 ASSERT_TRUE(SetupClients()); 95 ASSERT_TRUE(SetupClients());
90 96
91 AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0)); 97 AddPrinter(GetPrinterStore(0), printers_helper::CreateTestPrinter(0));
92 EXPECT_EQ(1, GetPrinterCount(0)); 98 EXPECT_EQ(1, GetPrinterCount(0));
93 99
94 EXPECT_TRUE(SetupSync()) << "SetupSync() failed."; 100 EXPECT_TRUE(SetupSync()) << "SetupSync() failed.";
95 } 101 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698