diff options
| author | xhwang <xhwang@chromium.org> | 2014-09-19 10:33:24 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-19 17:33:44 +0000 |
| commit | 0c617e11d065c8104e9b96775363bdeb7dd1e68b (patch) | |
| tree | 025ecd4367291ea90d1c6d88e47f30995733c06a /media | |
| parent | faf5e8d6cdcf08e45c370b3a96a00172a6103377 (diff) | |
| download | chromium_src-0c617e11d065c8104e9b96775363bdeb7dd1e68b.zip chromium_src-0c617e11d065c8104e9b96775363bdeb7dd1e68b.tar.gz chromium_src-0c617e11d065c8104e9b96775363bdeb7dd1e68b.tar.bz2 | |
CDM FileIOTest: Work around flakiness by not closing during read/write.
The flakiness is caused by issue 415401. Temporarily disable tests that close
the FileIO during pending read or write.
This also reenables ECKEncryptedMediaTest.FileIOTest by reverting commit
5af9a9c9d2d559014734c2eb2247d42f3fc0e740.
BUG=415401,415742
Review URL: https://codereview.chromium.org/582233003
Cr-Commit-Position: refs/heads/master@{#295726}
Diffstat (limited to 'media')
| -rw-r--r-- | media/cdm/ppapi/cdm_file_io_test.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/media/cdm/ppapi/cdm_file_io_test.cc b/media/cdm/ppapi/cdm_file_io_test.cc index 7658b45..2252e2c 100644 --- a/media/cdm/ppapi/cdm_file_io_test.cc +++ b/media/cdm/ppapi/cdm_file_io_test.cc @@ -362,7 +362,8 @@ void FileIOTestRunner::AddTests() { START_TEST_CASE("CloseDuringPendingWrite") OPEN_FILE EXPECT_FILE_OPENED(kSuccess) - WRITE_FILE(kData, kDataSize) + // TODO(xhwang): Reenable this after http:://crbug.com/415401 is fixed. + // WRITE_FILE(kData, kDataSize) CLOSE_FILE END_TEST_CASE @@ -371,7 +372,8 @@ void FileIOTestRunner::AddTests() { EXPECT_FILE_OPENED(kSuccess) WRITE_FILE(kData, kDataSize) EXPECT_FILE_WRITTEN(kSuccess) - WRITE_FILE(kBigData, kBigDataSize) + // TODO(xhwang): Reenable this after http:://crbug.com/415401 is fixed. + // WRITE_FILE(kBigData, kBigDataSize) CLOSE_FILE // Write() didn't finish and the content of the file is not modified. CREATE_FILE_IO @@ -386,7 +388,8 @@ void FileIOTestRunner::AddTests() { EXPECT_FILE_OPENED(kSuccess) WRITE_FILE(kBigData, kBigDataSize) EXPECT_FILE_WRITTEN(kSuccess) - WRITE_FILE(kData, kDataSize) + // TODO(xhwang): Reenable this after http:://crbug.com/415401 is fixed. + // WRITE_FILE(kData, kDataSize) CLOSE_FILE // Write() didn't finish and the content of the file is not modified. CREATE_FILE_IO @@ -401,7 +404,8 @@ void FileIOTestRunner::AddTests() { EXPECT_FILE_OPENED(kSuccess) WRITE_FILE(kData, kDataSize) EXPECT_FILE_WRITTEN(kSuccess) - READ_FILE + // TODO(xhwang): Reenable this after http:://crbug.com/415401 is fixed. + // READ_FILE CLOSE_FILE // Make sure the file is not modified. CREATE_FILE_IO |