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

Side by Side Diff: media/cdm/ppapi/cdm_file_io_test.cc

Issue 582233003: CDM FileIOTest: Work around flakiness by not closing during read/write. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/cdm/ppapi/cdm_file_io_test.h" 5 #include "media/cdm/ppapi/cdm_file_io_test.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 10
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 END_TEST_CASE 355 END_TEST_CASE
356 356
357 START_TEST_CASE("CloseDuringPendingOpen") 357 START_TEST_CASE("CloseDuringPendingOpen")
358 OPEN_FILE 358 OPEN_FILE
359 CLOSE_FILE 359 CLOSE_FILE
360 END_TEST_CASE 360 END_TEST_CASE
361 361
362 START_TEST_CASE("CloseDuringPendingWrite") 362 START_TEST_CASE("CloseDuringPendingWrite")
363 OPEN_FILE 363 OPEN_FILE
364 EXPECT_FILE_OPENED(kSuccess) 364 EXPECT_FILE_OPENED(kSuccess)
365 WRITE_FILE(kData, kDataSize) 365 // TODO(xhwang): Reenable this after http:://crbug.com/415401 is fixed.
366 // WRITE_FILE(kData, kDataSize)
366 CLOSE_FILE 367 CLOSE_FILE
367 END_TEST_CASE 368 END_TEST_CASE
368 369
369 START_TEST_CASE("CloseDuringPendingOverwriteWithLargerData") 370 START_TEST_CASE("CloseDuringPendingOverwriteWithLargerData")
370 OPEN_FILE 371 OPEN_FILE
371 EXPECT_FILE_OPENED(kSuccess) 372 EXPECT_FILE_OPENED(kSuccess)
372 WRITE_FILE(kData, kDataSize) 373 WRITE_FILE(kData, kDataSize)
373 EXPECT_FILE_WRITTEN(kSuccess) 374 EXPECT_FILE_WRITTEN(kSuccess)
374 WRITE_FILE(kBigData, kBigDataSize) 375 // TODO(xhwang): Reenable this after http:://crbug.com/415401 is fixed.
376 // WRITE_FILE(kBigData, kBigDataSize)
375 CLOSE_FILE 377 CLOSE_FILE
376 // Write() didn't finish and the content of the file is not modified. 378 // Write() didn't finish and the content of the file is not modified.
377 CREATE_FILE_IO 379 CREATE_FILE_IO
378 OPEN_FILE 380 OPEN_FILE
379 EXPECT_FILE_OPENED(kSuccess) 381 EXPECT_FILE_OPENED(kSuccess)
380 READ_FILE 382 READ_FILE
381 EXPECT_FILE_READ(kSuccess, kData, kDataSize) 383 EXPECT_FILE_READ(kSuccess, kData, kDataSize)
382 END_TEST_CASE 384 END_TEST_CASE
383 385
384 START_TEST_CASE("CloseDuringPendingOverwriteWithSmallerData") 386 START_TEST_CASE("CloseDuringPendingOverwriteWithSmallerData")
385 OPEN_FILE 387 OPEN_FILE
386 EXPECT_FILE_OPENED(kSuccess) 388 EXPECT_FILE_OPENED(kSuccess)
387 WRITE_FILE(kBigData, kBigDataSize) 389 WRITE_FILE(kBigData, kBigDataSize)
388 EXPECT_FILE_WRITTEN(kSuccess) 390 EXPECT_FILE_WRITTEN(kSuccess)
389 WRITE_FILE(kData, kDataSize) 391 // TODO(xhwang): Reenable this after http:://crbug.com/415401 is fixed.
392 // WRITE_FILE(kData, kDataSize)
390 CLOSE_FILE 393 CLOSE_FILE
391 // Write() didn't finish and the content of the file is not modified. 394 // Write() didn't finish and the content of the file is not modified.
392 CREATE_FILE_IO 395 CREATE_FILE_IO
393 OPEN_FILE 396 OPEN_FILE
394 EXPECT_FILE_OPENED(kSuccess) 397 EXPECT_FILE_OPENED(kSuccess)
395 READ_FILE 398 READ_FILE
396 EXPECT_FILE_READ(kSuccess, kBigData, kBigDataSize) 399 EXPECT_FILE_READ(kSuccess, kBigData, kBigDataSize)
397 END_TEST_CASE 400 END_TEST_CASE
398 401
399 START_TEST_CASE("CloseDuringPendingRead") 402 START_TEST_CASE("CloseDuringPendingRead")
400 OPEN_FILE 403 OPEN_FILE
401 EXPECT_FILE_OPENED(kSuccess) 404 EXPECT_FILE_OPENED(kSuccess)
402 WRITE_FILE(kData, kDataSize) 405 WRITE_FILE(kData, kDataSize)
403 EXPECT_FILE_WRITTEN(kSuccess) 406 EXPECT_FILE_WRITTEN(kSuccess)
404 READ_FILE 407 // TODO(xhwang): Reenable this after http:://crbug.com/415401 is fixed.
408 // READ_FILE
405 CLOSE_FILE 409 CLOSE_FILE
406 // Make sure the file is not modified. 410 // Make sure the file is not modified.
407 CREATE_FILE_IO 411 CREATE_FILE_IO
408 OPEN_FILE 412 OPEN_FILE
409 EXPECT_FILE_OPENED(kSuccess) 413 EXPECT_FILE_OPENED(kSuccess)
410 READ_FILE 414 READ_FILE
411 EXPECT_FILE_READ(kSuccess, kData, kDataSize) 415 EXPECT_FILE_READ(kSuccess, kData, kDataSize)
412 END_TEST_CASE 416 END_TEST_CASE
413 417
414 START_TEST_CASE("StressTest") 418 START_TEST_CASE("StressTest")
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 void FileIOTest::OnTestComplete(bool success) { 604 void FileIOTest::OnTestComplete(bool success) {
601 while (!file_io_stack_.empty()) { 605 while (!file_io_stack_.empty()) {
602 file_io_stack_.top()->Close(); 606 file_io_stack_.top()->Close();
603 file_io_stack_.pop(); 607 file_io_stack_.pop();
604 } 608 }
605 FILE_IO_DVLOG(3) << test_name_ << (success ? " PASSED" : " FAILED"); 609 FILE_IO_DVLOG(3) << test_name_ << (success ? " PASSED" : " FAILED");
606 base::ResetAndReturn(&completion_cb_).Run(success); 610 base::ResetAndReturn(&completion_cb_).Run(success);
607 } 611 }
608 612
609 } // namespace media 613 } // namespace media
OLDNEW
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698