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

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

Issue 778843002: Disable flaky TwoClientBookmarksSyncTest.SC_MovingBMsFromBMFoldToBMBar on Mac (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/rand_util.h" 5 #include "base/rand_util.h"
6 #include "base/run_loop.h" 6 #include "base/run_loop.h"
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/policy/profile_policy_connector_factory.h" 8 #include "chrome/browser/policy/profile_policy_connector_factory.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
(...skipping 865 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 GetBookmarkBarNode(0)->child_count() - 2; 876 GetBookmarkBarNode(0)->child_count() - 2;
877 for (int i = 0; i < num_bookmarks_to_move; ++i) { 877 for (int i = 0; i < num_bookmarks_to_move; ++i) {
878 Move( 878 Move(
879 0, GetBookmarkBarNode(0)->GetChild(2), folder, i); 879 0, GetBookmarkBarNode(0)->GetChild(2), folder, i);
880 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); 880 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1)));
881 ASSERT_TRUE(AllModelsMatchVerifier()); 881 ASSERT_TRUE(AllModelsMatchVerifier());
882 } 882 }
883 } 883 }
884 884
885 // Test Scribe ID - 371957. 885 // Test Scribe ID - 371957.
886 // flaky on Windows: http://crbug.com/412169 886 // flaky on Windows and Mac: http://crbug.com/412169
887 #if defined(OS_WIN) 887 #if defined(OS_WIN) || defined(OS_MACOSX)
888 #define MAYBE_SC_MovingBMsFromBMFoldToBMBar DISABLED_SC_MovingBMsFromBMFoldToBMB ar 888 #define MAYBE_SC_MovingBMsFromBMFoldToBMBar DISABLED_SC_MovingBMsFromBMFoldToBMB ar
889 #else 889 #else
890 #define MAYBE_SC_MovingBMsFromBMFoldToBMBar SC_MovingBMsFromBMFoldToBMBar 890 #define MAYBE_SC_MovingBMsFromBMFoldToBMBar SC_MovingBMsFromBMFoldToBMBar
891 #endif 891 #endif
892 IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest, 892 IN_PROC_BROWSER_TEST_F(TwoClientBookmarksSyncTest,
893 MAYBE_SC_MovingBMsFromBMFoldToBMBar) { 893 MAYBE_SC_MovingBMsFromBMFoldToBMBar) {
894 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 894 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
895 ASSERT_TRUE(AllModelsMatchVerifier()); 895 ASSERT_TRUE(AllModelsMatchVerifier());
896 896
897 ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL); 897 ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL);
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
2124 2124
2125 // Verify that the managed bookmark exists in the local model of the first 2125 // Verify that the managed bookmark exists in the local model of the first
2126 // Profile, and has a child node. 2126 // Profile, and has a child node.
2127 ASSERT_EQ(1, managed_node0->child_count()); 2127 ASSERT_EQ(1, managed_node0->child_count());
2128 ASSERT_TRUE(managed_node0->IsVisible()); 2128 ASSERT_TRUE(managed_node0->IsVisible());
2129 EXPECT_EQ(GURL("http://youtube.com/"), managed_node0->GetChild(0)->url()); 2129 EXPECT_EQ(GURL("http://youtube.com/"), managed_node0->GetChild(0)->url());
2130 2130
2131 // Verify that the second Profile didn't get this node. 2131 // Verify that the second Profile didn't get this node.
2132 ASSERT_EQ(0, managed_node1->child_count()); 2132 ASSERT_EQ(0, managed_node1->child_count());
2133 } 2133 }
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