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

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

Issue 11664013: GTTF: No more FLAKY_ . (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
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/prefs/public/pref_member.h" 5 #include "base/prefs/public/pref_member.h"
6 #include "chrome/browser/prefs/pref_service.h" 6 #include "chrome/browser/prefs/pref_service.h"
7 #include "chrome/browser/sync/profile_sync_service.h" 7 #include "chrome/browser/sync/profile_sync_service.h"
8 #include "chrome/browser/sync/profile_sync_service_harness.h" 8 #include "chrome/browser/sync/profile_sync_service_harness.h"
9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
10 #include "chrome/browser/sync/test/integration/passwords_helper.h" 10 #include "chrome/browser/sync/test/integration/passwords_helper.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 SetTitle(0, node2, L"new_title2"); 155 SetTitle(0, node2, L"new_title2");
156 ASSERT_TRUE(GetClient(0)->AwaitExponentialBackoffVerification()); 156 ASSERT_TRUE(GetClient(0)->AwaitExponentialBackoffVerification());
157 ASSERT_EQ(GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS, 157 ASSERT_EQ(GoogleServiceAuthError::INVALID_GAIA_CREDENTIALS,
158 GetClient(0)->service()->GetAuthError().state()); 158 GetClient(0)->service()->GetAuthError().state());
159 } 159 }
160 160
161 // Trigger an XMPP auth error, and make sure sync treats it like any 161 // Trigger an XMPP auth error, and make sure sync treats it like any
162 // other auth error. 162 // other auth error.
163 // This has been flaking a lot recently on Mac. http://crbug.com/165328 163 // This has been flaking a lot recently on Mac. http://crbug.com/165328
164 #if defined(OS_MACOSX) 164 #if defined(OS_MACOSX)
165 #define MAYBE_XmppAuthErrorTest FLAKY_XmppAuthErrorTest 165 #define MAYBE_XmppAuthErrorTest DISABLED_XmppAuthErrorTest
166 #else 166 #else
167 #define MAYBE_XmppAuthErrorTest XmppAuthErrorTest 167 #define MAYBE_XmppAuthErrorTest XmppAuthErrorTest
168 #endif 168 #endif
169 IN_PROC_BROWSER_TEST_F(SyncErrorTest, MAYBE_XmppAuthErrorTest) { 169 IN_PROC_BROWSER_TEST_F(SyncErrorTest, MAYBE_XmppAuthErrorTest) {
170 ASSERT_TRUE(SetupClients()) << "SetupClients() failed."; 170 ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
171 171
172 TriggerXmppAuthError(); 172 TriggerXmppAuthError();
173 173
174 ASSERT_FALSE(GetClient(0)->SetupSync()); 174 ASSERT_FALSE(GetClient(0)->SetupSync());
175 175
(...skipping 12 matching lines...) Expand all
188 188
189 synced_datatypes = GetClient(0)->service()->GetPreferredDataTypes(); 189 synced_datatypes = GetClient(0)->service()->GetPreferredDataTypes();
190 ASSERT_FALSE(synced_datatypes.Has(syncer::TYPED_URLS)); 190 ASSERT_FALSE(synced_datatypes.Has(syncer::TYPED_URLS));
191 191
192 const BookmarkNode* node1 = AddFolder(0, 0, L"title1"); 192 const BookmarkNode* node1 = AddFolder(0, 0, L"title1");
193 SetTitle(0, node1, L"new_title1"); 193 SetTitle(0, node1, L"new_title1");
194 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Sync.")); 194 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Sync."));
195 // TODO(lipalani)" Verify initial sync ended for typed url is false. 195 // TODO(lipalani)" Verify initial sync ended for typed url is false.
196 } 196 }
197 197
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698