diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 18:11:27 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-26 18:11:27 +0000 |
| commit | e94c24c7b26c20f0995acf4e0069107a493ffe2e (patch) | |
| tree | 3b47e60fd8013983b3f7849e266975659e0be39e /chrome/common/extensions/extension_unpacker_unittest.cc | |
| parent | 387162074748ac81f67eecfa83ff37dff155d2ac (diff) | |
| download | chromium_src-e94c24c7b26c20f0995acf4e0069107a493ffe2e.zip chromium_src-e94c24c7b26c20f0995acf4e0069107a493ffe2e.tar.gz chromium_src-e94c24c7b26c20f0995acf4e0069107a493ffe2e.tar.bz2 | |
Revert 119014 - Reenable tests that were crashing due to a bad Vista Tests (3) bot.
BUG=108724,106381,108429,108721,109238,109385,109738
TEST=no
Review URL: http://codereview.chromium.org/9289010
TBR=mpcomplete@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9271074
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119257 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common/extensions/extension_unpacker_unittest.cc')
| -rw-r--r-- | chrome/common/extensions/extension_unpacker_unittest.cc | 34 |
1 files changed, 30 insertions, 4 deletions
diff --git a/chrome/common/extensions/extension_unpacker_unittest.cc b/chrome/common/extensions/extension_unpacker_unittest.cc index 6e67389c..d50eb8c 100644 --- a/chrome/common/extensions/extension_unpacker_unittest.cc +++ b/chrome/common/extensions/extension_unpacker_unittest.cc @@ -46,28 +46,54 @@ public: scoped_ptr<ExtensionUnpacker> unpacker_; }; -TEST_F(ExtensionUnpackerTest, EmptyDefaultLocale) { +// Crashes intermittently on Windows, see http://crbug.com/109238 +#if defined(OS_WIN) +#define MAYBE_EmptyDefaultLocale DISABLED_EmptyDefaultLocale +#else +#define MAYBE_EmptyDefaultLocale EmptyDefaultLocale +#endif +TEST_F(ExtensionUnpackerTest, MAYBE_EmptyDefaultLocale) { SetupUnpacker("empty_default_locale.crx"); EXPECT_FALSE(unpacker_->Run()); EXPECT_EQ(ASCIIToUTF16(errors::kInvalidDefaultLocale), unpacker_->error_message()); } -TEST_F(ExtensionUnpackerTest, HasDefaultLocaleMissingLocalesFolder) { +// Crashes intermittently on Vista, see http://crbug.com/109385 +#if defined(OS_WIN) +#define MAYBE_HasDefaultLocaleMissingLocalesFolder \ + DISABLED_HasDefaultLocaleMissingLocalesFolder +#else +#define MAYBE_HasDefaultLocaleMissingLocalesFolder \ + HasDefaultLocaleMissingLocalesFolder +#endif +TEST_F(ExtensionUnpackerTest, MAYBE_HasDefaultLocaleMissingLocalesFolder) { SetupUnpacker("has_default_missing_locales.crx"); EXPECT_FALSE(unpacker_->Run()); EXPECT_EQ(ASCIIToUTF16(errors::kLocalesTreeMissing), unpacker_->error_message()); } -TEST_F(ExtensionUnpackerTest, InvalidDefaultLocale) { +// Crashes intermittently on Windows, see http://crbug.com/109238 +#if defined(OS_WIN) +#define MAYBE_InvalidDefaultLocale DISABLED_InvalidDefaultLocale +#else +#define MAYBE_InvalidDefaultLocale InvalidDefaultLocale +#endif +TEST_F(ExtensionUnpackerTest, MAYBE_InvalidDefaultLocale) { SetupUnpacker("invalid_default_locale.crx"); EXPECT_FALSE(unpacker_->Run()); EXPECT_EQ(ASCIIToUTF16(errors::kInvalidDefaultLocale), unpacker_->error_message()); } -TEST_F(ExtensionUnpackerTest, InvalidMessagesFile) { +// Crashes intermittently on Windows, see http://crbug.com/109738 +#if defined(OS_WIN) +#define MAYBE_InvalidMessagesFile DISABLE_InvalidMessagesFile +#else +#define MAYBE_InvalidMessagesFile InvalidMessagesFile +#endif +TEST_F(ExtensionUnpackerTest, MAYBE_InvalidMessagesFile) { SetupUnpacker("invalid_messages_file.crx"); EXPECT_FALSE(unpacker_->Run()); EXPECT_TRUE(MatchPattern(unpacker_->error_message(), |