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

Unified Diff: chrome/browser/webdata/token_service_table_unittest.cc

Issue 13749010: Disable ProfileSyncServicePasswordTest and TokenServiceTableTest on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | « chrome/browser/sync/profile_sync_service_password_unittest.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/webdata/token_service_table_unittest.cc
diff --git a/chrome/browser/webdata/token_service_table_unittest.cc b/chrome/browser/webdata/token_service_table_unittest.cc
index 20429dd24c6e9b32d2086dd7ca505790d4628fd3..db409f8322d0fb75e1047a5a229825ffef47a7de 100644
--- a/chrome/browser/webdata/token_service_table_unittest.cc
+++ b/chrome/browser/webdata/token_service_table_unittest.cc
@@ -37,7 +37,16 @@ class TokenServiceTableTest : public testing::Test {
DISALLOW_COPY_AND_ASSIGN(TokenServiceTableTest);
};
-TEST_F(TokenServiceTableTest, TokenServiceGetAllRemoveAll) {
+// Flaky on mac_rel. See http://crbug.com/228943
+#if defined(OS_MACOSX)
+#define MAYBE_TokenServiceGetAllRemoveAll DISABLED_TokenServiceGetAllRemoveAll
+#define MAYBE_TokenServiceGetSet DISABLED_TokenServiceGetSet
+#else
+#define MAYBE_TokenServiceGetAllRemoveAll TokenServiceGetAllRemoveAll
+#define MAYBE_TokenServiceGetSet TokenServiceGetSet
+#endif
+
+TEST_F(TokenServiceTableTest, MAYBE_TokenServiceGetAllRemoveAll) {
std::map<std::string, std::string> out_map;
std::string service;
std::string service2;
@@ -66,7 +75,7 @@ TEST_F(TokenServiceTableTest, TokenServiceGetAllRemoveAll) {
EXPECT_EQ(out_map.find(service)->second, "cheese");
}
-TEST_F(TokenServiceTableTest, TokenServiceGetSet) {
+TEST_F(TokenServiceTableTest, MAYBE_TokenServiceGetSet) {
std::map<std::string, std::string> out_map;
std::string service;
service = "testservice";
« no previous file with comments | « chrome/browser/sync/profile_sync_service_password_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698