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

Unified Diff: extensions/browser/content_hash_fetcher_unittest.cc

Issue 2815243002: Fix two ContentHashFetcherTest.* tests' flakiness. (Closed)
Patch Set: REWORK Created 3 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
Index: extensions/browser/content_hash_fetcher_unittest.cc
diff --git a/extensions/browser/content_hash_fetcher_unittest.cc b/extensions/browser/content_hash_fetcher_unittest.cc
index e54b4d66f7b8be0cb6e32f25e6fa4100da187bd8..68a1111db0c007c2d74e1bb160f95d8fd5607310 100644
--- a/extensions/browser/content_hash_fetcher_unittest.cc
+++ b/extensions/browser/content_hash_fetcher_unittest.cc
@@ -186,15 +186,9 @@ class ContentHashFetcherTest : public ExtensionsTest {
base::ScopedTempDir temp_dir_;
};
-// Flaky on Linux and ChromeOS. https://crbug.com/702300
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-#define MAYBE_MissingVerifiedContents DISABLED_MissingVerifiedContents
-#else
-#define MAYBE_MissingVerifiedContents MissingVerifiedContents
-#endif
// This tests our ability to successfully fetch, parse, and validate a missing
// verified_contents.json file for an extension.
-TEST_F(ContentHashFetcherTest, MAYBE_MissingVerifiedContents) {
+TEST_F(ContentHashFetcherTest, MissingVerifiedContents) {
// We unzip the extension source to a temp directory to simulate it being
// installed there, because the ContentHashFetcher will create the _metadata/
// directory within the extension install dir and write the fetched
@@ -233,17 +227,9 @@ TEST_F(ContentHashFetcherTest, MAYBE_MissingVerifiedContents) {
base::PathExists(file_util::GetVerifiedContentsPath(extension->path())));
}
-// Flaky on Linux and ChromeOS. https://crbug.com/702300
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
-#define MAYBE_MissingVerifiedContentsAndCorrupt \
- DISABLED_MissingVerifiedContentsAndCorrupt
-#else
-#define MAYBE_MissingVerifiedContentsAndCorrupt \
- MissingVerifiedContentsAndCorrupt
-#endif
// Similar to MissingVerifiedContents, but tests the case where the extension
// actually has corruption.
-TEST_F(ContentHashFetcherTest, MAYBE_MissingVerifiedContentsAndCorrupt) {
+TEST_F(ContentHashFetcherTest, MissingVerifiedContentsAndCorrupt) {
base::FilePath test_dir_base =
GetTestPath(base::FilePath()).AppendASCII("missing_verified_contents");
scoped_refptr<Extension> extension =
« extensions/browser/content_hash_fetcher.cc ('K') | « extensions/browser/content_hash_fetcher.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698