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

Unified Diff: chrome/browser/sync/test/integration/sync_errors_test.cc

Issue 12252029: [sync] Re-enable SyncErrorTest.XmppAuthErrorTest (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/test/integration/sync_errors_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_errors_test.cc b/chrome/browser/sync/test/integration/sync_errors_test.cc
index e572a4b3826658aecb2d0d8f9704efe68a8ffd2c..4f65f4c33208d6553afdd3a27039c8652a93d309 100644
--- a/chrome/browser/sync/test/integration/sync_errors_test.cc
+++ b/chrome/browser/sync/test/integration/sync_errors_test.cc
@@ -160,13 +160,7 @@ IN_PROC_BROWSER_TEST_F(SyncErrorTest, AuthErrorTest) {
// Trigger an XMPP auth error, and make sure sync treats it like any
// other auth error.
-// This has been flaking a lot recently on Mac. http://crbug.com/165328
-#if defined(OS_MACOSX)
-#define MAYBE_XmppAuthErrorTest DISABLED_XmppAuthErrorTest
-#else
-#define MAYBE_XmppAuthErrorTest XmppAuthErrorTest
-#endif
-IN_PROC_BROWSER_TEST_F(SyncErrorTest, MAYBE_XmppAuthErrorTest) {
+IN_PROC_BROWSER_TEST_F(SyncErrorTest, XmppAuthErrorTest) {
ASSERT_TRUE(SetupClients()) << "SetupClients() failed.";
TriggerXmppAuthError();
« 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