summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-11 20:31:04 +0000
committerrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-11 20:31:04 +0000
commit09c1973dd93208a0d1d96c8b095dcf9c7cb10043 (patch)
tree138f3346f0d248df084f88a52aca7d6040a970cc
parent499e74164d2d498614ad614aab505f771d0362f6 (diff)
downloadchromium_src-09c1973dd93208a0d1d96c8b095dcf9c7cb10043.zip
chromium_src-09c1973dd93208a0d1d96c8b095dcf9c7cb10043.tar.gz
chromium_src-09c1973dd93208a0d1d96c8b095dcf9c7cb10043.tar.bz2
Disable failing themes sync integration tests.
Some of the integration tests for themes fail due to http://crbug.com/62779. Marking them as FAILS until the bug is fixed. TBR=akalin@chromium.org BUG=62779 TEST=sync_integration_tests Review URL: http://codereview.chromium.org/4809001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65842 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/live_sync/single_client_live_themes_sync_test.cc6
-rw-r--r--chrome/test/live_sync/two_client_live_themes_sync_test.cc6
2 files changed, 8 insertions, 4 deletions
diff --git a/chrome/test/live_sync/single_client_live_themes_sync_test.cc b/chrome/test/live_sync/single_client_live_themes_sync_test.cc
index f8cef03..8642aca 100644
--- a/chrome/test/live_sync/single_client_live_themes_sync_test.cc
+++ b/chrome/test/live_sync/single_client_live_themes_sync_test.cc
@@ -39,7 +39,8 @@ IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, CustomTheme) {
ASSERT_EQ(theme, GetCustomTheme(verifier()));
}
-IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, NativeTheme) {
+// TODO(akalin): Re-enable this after http://crbug.com/62779 is fixed.
+IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, FAILS_NativeTheme) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
scoped_refptr<Extension> theme = GetTheme(0);
@@ -63,7 +64,8 @@ IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, NativeTheme) {
ASSERT_TRUE(UsingNativeTheme(verifier()));
}
-IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, DefaultTheme) {
+// TODO(akalin): Re-enable this after http://crbug.com/62779 is fixed.
+IN_PROC_BROWSER_TEST_F(SingleClientLiveThemesSyncTest, FAILS_DefaultTheme) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
scoped_refptr<Extension> theme = GetTheme(0);
diff --git a/chrome/test/live_sync/two_client_live_themes_sync_test.cc b/chrome/test/live_sync/two_client_live_themes_sync_test.cc
index c9db7b9..57201c5 100644
--- a/chrome/test/live_sync/two_client_live_themes_sync_test.cc
+++ b/chrome/test/live_sync/two_client_live_themes_sync_test.cc
@@ -44,7 +44,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, CustomTheme) {
ASSERT_EQ(theme, GetCustomTheme(verifier()));
}
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, NativeTheme) {
+// TODO(akalin): Re-enable this after http://crbug.com/62779 is fixed.
+IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, FAILS_NativeTheme) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
scoped_refptr<Extension> theme = GetTheme(0);
@@ -67,7 +68,8 @@ IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, NativeTheme) {
ASSERT_TRUE(UsingNativeTheme(verifier()));
}
-IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, DefaultTheme) {
+// TODO(akalin): Re-enable this after http://crbug.com/62779 is fixed.
+IN_PROC_BROWSER_TEST_F(TwoClientLiveThemesSyncTest, FAILS_DefaultTheme) {
ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
scoped_refptr<Extension> theme = GetTheme(0);