diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-04 19:12:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-04 19:12:22 +0200 |
| commit | 29a46aa4ac38bf9faedbaca6d1c191d38d2db079 (patch) | |
| tree | 9e98e216e4fa2374883b0f7662160399c9c3dad6 /tests | |
| parent | 339944b284e9dd11302dd013f9d9a10ad0d9055a (diff) | |
| parent | 7966aca38451ed9ef32ac0fb1b344cdbf22521bb (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: If640a9831fc4faf43a445bd0379fee1d53661f47
Diffstat (limited to 'tests')
| -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()); |