summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-14 19:06:56 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-14 19:06:56 +0000
commitb942fa3b53afd1f2b337b433e824b59f3fc7cea3 (patch)
tree44b60baa494b1de5eeeccca4602f0fb6e8bcd44d
parente8560886730af4ac66f9d56bb193952facf5b90b (diff)
downloadchromium_src-b942fa3b53afd1f2b337b433e824b59f3fc7cea3.zip
chromium_src-b942fa3b53afd1f2b337b433e824b59f3fc7cea3.tar.gz
chromium_src-b942fa3b53afd1f2b337b433e824b59f3fc7cea3.tar.bz2
Mark ExtensionFileUtil.BackgroundScriptsMustExist as flaky on Windows.
BUG=110279 TEST=none TBR=aa Review URL: http://codereview.chromium.org/9133027 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@117804 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/common/extensions/extension_file_util_unittest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/common/extensions/extension_file_util_unittest.cc b/chrome/common/extensions/extension_file_util_unittest.cc
index 0d6c66b..47eb52a 100644
--- a/chrome/common/extensions/extension_file_util_unittest.cc
+++ b/chrome/common/extensions/extension_file_util_unittest.cc
@@ -318,7 +318,13 @@ TEST(ExtensionFileUtil, ValidateThemeUTF8) {
error;
}
-TEST(ExtensionFileUtil, BackgroundScriptsMustExist) {
+#if defined(OS_WIN)
+// This test is flaky on Windows. http://crbug.com/110279
+#define MAYBE_BackgroundScriptsMustExist FLAKY_BackgroundScriptsMustExist
+#else
+#define MAYBE_BackgroundScriptsMustExist BackgroundScriptsMustExist
+#endif
+TEST(ExtensionFileUtil, MAYBE_BackgroundScriptsMustExist) {
ScopedTempDir temp;
ASSERT_TRUE(temp.CreateUniqueTempDir());