diff options
| author | wdzierzanowski <wdzierzanowski@opera.com> | 2015-12-01 09:10:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-01 17:11:09 +0000 |
| commit | 7a7643ee8652ddab8503c57fe0ff1af174ea235b (patch) | |
| tree | f2e8a8c2e2f5b717e64fdd494e7e6e1e16ca77dc | |
| parent | 824c1056e444395a43870a02c9f9c04cc6a58dcd (diff) | |
| download | chromium_src-7a7643ee8652ddab8503c57fe0ff1af174ea235b.zip chromium_src-7a7643ee8652ddab8503c57fe0ff1af174ea235b.tar.gz chromium_src-7a7643ee8652ddab8503c57fe0ff1af174ea235b.tar.bz2 | |
Allow multiple OnMoreData() calls in WASAPIAudioOutputStreamTest.ValidPacketSize
Follow up on https://codereview.chromium.org/1318933003/ and allow
OnMoreData() to be called more than once in the test.
BUG=524947
TEST=WASAPIAudioOutputStreamTest.ValidPacketSize passes
Review URL: https://codereview.chromium.org/1487733003
Cr-Commit-Position: refs/heads/master@{#362439}
| -rw-r--r-- | media/audio/win/audio_low_latency_output_win_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/audio/win/audio_low_latency_output_win_unittest.cc b/media/audio/win/audio_low_latency_output_win_unittest.cc index a981b33..4c39228 100644 --- a/media/audio/win/audio_low_latency_output_win_unittest.cc +++ b/media/audio/win/audio_low_latency_output_win_unittest.cc @@ -380,10 +380,12 @@ TEST(WASAPIAudioOutputStreamTest, ValidPacketSize) { uint32 bytes_per_packet = aosw.channels() * aosw.samples_per_packet() * (aosw.bits_per_sample() / 8); - // Wait for the first callback and verify its parameters. + // Wait for the first callback and verify its parameters. Ignore any + // subsequent callbacks that might arrive. EXPECT_CALL(source, OnMoreData(NotNull(), HasValidDelay(bytes_per_packet))) .WillOnce(DoAll(QuitLoop(loop.task_runner()), - Return(aosw.samples_per_packet()))); + Return(aosw.samples_per_packet()))) + .WillRepeatedly(Return(0)); aos->Start(&source); loop.PostDelayedTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure(), |