diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-09 10:23:09 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-09 10:23:09 +0200 |
| commit | 393602150d1f3eec25252aa40045f9e24ae5329b (patch) | |
| tree | 37c33a09da4f3d68de5d12ec09f97e137d32e6d6 /tests/auto | |
| parent | 268277552bd65119a72c75c9eb792cd0a70859bd (diff) | |
| parent | 29a46aa4ac38bf9faedbaca6d1c191d38d2db079 (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I0e74582a735dd8fd169ac928a32143ab80a2d2a0
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/integration/qaudioinput/tst_qaudioinput.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp index 2706481c9..8463149db 100644 --- a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp +++ b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp @@ -639,7 +639,7 @@ void tst_QAudioInput::push() QByteArray buffer(AUDIO_BUFFER, 0); qint64 len = (audioFormat.sampleRate()*audioFormat.channelCount()*(audioFormat.sampleSize()/8)*2); // 2 seconds while (totalBytesRead < len) { - QTRY_VERIFY(audioInput.bytesReady() >= audioInput.periodSize()); + QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesReady() >= audioInput.periodSize(), 10000); qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize()); audioFile->write(buffer.constData(),bytesRead); totalBytesRead+=bytesRead; @@ -720,7 +720,7 @@ void tst_QAudioInput::pushSuspendResume() QByteArray buffer(AUDIO_BUFFER, 0); qint64 len = (audioFormat.sampleRate()*audioFormat.channelCount()*(audioFormat.sampleSize()/8)); // 1 seconds while (totalBytesRead < len) { - QTRY_VERIFY(audioInput.bytesReady() >= audioInput.periodSize()); + QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesReady() >= audioInput.periodSize(), 10000); qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize()); audioFile->write(buffer.constData(),bytesRead); totalBytesRead+=bytesRead; @@ -775,7 +775,7 @@ void tst_QAudioInput::pushSuspendResume() totalBytesRead = 0; firstBuffer = true; while (totalBytesRead < len && audioInput.state() != QAudio::StoppedState) { - QTRY_VERIFY(audioInput.bytesReady() >= audioInput.periodSize()); + QTRY_VERIFY_WITH_TIMEOUT(audioInput.bytesReady() >= audioInput.periodSize(), 10000); qint64 bytesRead = feed->read(buffer.data(), audioInput.periodSize()); audioFile->write(buffer.constData(),bytesRead); totalBytesRead+=bytesRead; @@ -822,7 +822,7 @@ void tst_QAudioInput::reset() QVERIFY2((audioInput.state() == QAudio::IdleState), "didn't transition to IdleState after start()"); QVERIFY2((audioInput.error() == QAudio::NoError), "error state is not equal to QAudio::NoError after start()"); QVERIFY(audioInput.periodSize() > 0); - QTRY_VERIFY2((audioInput.bytesReady() > audioInput.periodSize()), "no bytes available after starting"); + QTRY_VERIFY2_WITH_TIMEOUT((audioInput.bytesReady() > audioInput.periodSize()), "no bytes available after starting", 10000); // Trigger a read QByteArray data = device->read(audioInput.periodSize()); |