Commit 836b44f8 authored by David Bertoni's avatar David Bertoni Committed by Commit Bot

[Extensions] Re-enable some ImageWriterWriteFromUrlOperationTest

tests.

The SelectTargetWithoutExtension and SelectTargetWithExtension
tests were disabled on TSAN configurations because they flaky.
I ran these tests for 3000 iterations on TSAN bots without any
failures.

Bug: 859317
Change-Id: Ie8031f79b8725229d7dc5294855ef89730084d85
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2199996
Commit-Queue: Karan Bhatia <karandeepb@chromium.org>
Reviewed-by: default avatarKaran Bhatia <karandeepb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#769066}
parent b9287553
...@@ -137,15 +137,7 @@ class ImageWriterWriteFromUrlOperationTest : public ImageWriterUnitTestBase { ...@@ -137,15 +137,7 @@ class ImageWriterWriteFromUrlOperationTest : public ImageWriterUnitTestBase {
MockOperationManager manager_; MockOperationManager manager_;
}; };
// Crashes on Tsan. http://crbug.com/859317 TEST_F(ImageWriterWriteFromUrlOperationTest, SelectTargetWithoutExtension) {
#if defined(THREAD_SANITIZER)
#define MAYBE_SelectTargetWithoutExtension DISABLED_SelectTargetWithoutExtension
#define MAYBE_SelectTargetWithExtension DISABLED_SelectTargetWithExtension
#else
#define MAYBE_SelectTargetWithoutExtension SelectTargetWithoutExtension
#define MAYBE_SelectTargetWithExtension SelectTargetWithExtension
#endif
TEST_F(ImageWriterWriteFromUrlOperationTest, MAYBE_SelectTargetWithoutExtension) {
scoped_refptr<WriteFromUrlOperationForTest> operation = scoped_refptr<WriteFromUrlOperationForTest> operation =
CreateOperation(GURL("http://localhost/foo/bar"), ""); CreateOperation(GURL("http://localhost/foo/bar"), "");
...@@ -160,7 +152,7 @@ TEST_F(ImageWriterWriteFromUrlOperationTest, MAYBE_SelectTargetWithoutExtension) ...@@ -160,7 +152,7 @@ TEST_F(ImageWriterWriteFromUrlOperationTest, MAYBE_SelectTargetWithoutExtension)
content::RunAllTasksUntilIdle(); content::RunAllTasksUntilIdle();
} }
TEST_F(ImageWriterWriteFromUrlOperationTest, MAYBE_SelectTargetWithExtension) { TEST_F(ImageWriterWriteFromUrlOperationTest, SelectTargetWithExtension) {
scoped_refptr<WriteFromUrlOperationForTest> operation = scoped_refptr<WriteFromUrlOperationForTest> operation =
CreateOperation(GURL("http://localhost/foo/bar.zip"), ""); CreateOperation(GURL("http://localhost/foo/bar.zip"), "");
...@@ -173,9 +165,6 @@ TEST_F(ImageWriterWriteFromUrlOperationTest, MAYBE_SelectTargetWithExtension) { ...@@ -173,9 +165,6 @@ TEST_F(ImageWriterWriteFromUrlOperationTest, MAYBE_SelectTargetWithExtension) {
operation->Cancel(); operation->Cancel();
} }
#undef MAYBE_SelectTargetWithoutExtension
#undef MAYBE_SelectTargetWithExtension
TEST_F(ImageWriterWriteFromUrlOperationTest, DownloadFile) { TEST_F(ImageWriterWriteFromUrlOperationTest, DownloadFile) {
// This test actually triggers the URL fetch code, which will drain the // This test actually triggers the URL fetch code, which will drain the
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment