diff options
author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2012-07-12 12:32:48 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-13 04:06:54 +0200 |
commit | 59bfb014c8c0f0f328a26eb27c2a6250bb421c57 (patch) | |
tree | a73f52fa99fdeb56662f694a2630ef16f70f195e /tests | |
parent | 5f06930b166e8dda5309bb40cd2379073a018ba4 (diff) | |
download | qtmultimedia-59bfb014c8c0f0f328a26eb27c2a6250bb421c57.tar.gz |
Fixed qaudioinput and qaudiooutput tests running on loaded system
- Changed tests to handle running on loaded or very slow systems
- notify signal checks that signals are emitted but not number of
as these are time related and number of emitted signals could
vary greatly on slow or loaded systems.
- Added skip for CI system pushSuspendResume with pulseaudio backend.
Change-Id: I0abf242934507454cc992fe8daec46d6acaa2836
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/auto/integration/qaudioinput/tst_qaudioinput.cpp | 8 | ||||
-rwxr-xr-x | tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp | 12 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp index 4db63d007..38f04e138 100755 --- a/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp +++ b/tests/auto/integration/qaudioinput/tst_qaudioinput.cpp @@ -55,7 +55,7 @@ //TESTED_COMPONENT=src/multimedia #define AUDIO_BUFFER 192000 -#define RANGE_ERR 0.2 +#define RANGE_ERR 0.5 template<typename T> inline bool qTolerantCompare(T value, T expected) { @@ -577,8 +577,7 @@ void tst_QAudioInput::pullSuspendResume() QString("processedUSecs() doesn't fall in acceptable range, should be 3040000 (%1)").arg(processedUs).toLocal8Bit().constData()); QVERIFY2((audioInput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); QVERIFY2((audioInput.elapsedUSecs() == (qint64)0), "elapsedUSecs() not equal to zero in StoppedState"); - QVERIFY2((notifySignal.count() > 10 && notifySignal.count() < 50), - QString("notify() signals emitted (%1) should be 30").arg(notifySignal.count()).toLocal8Bit().constData()); + QVERIFY2(notifySignal.count() > 0, "not emitting notify() signal"); WavHeader::writeDataLength(*audioFiles.at(i),audioFiles.at(i)->pos()-WavHeader::headerLength()); audioFile->close(); @@ -660,8 +659,7 @@ void tst_QAudioInput::push() QString("processedUSecs() doesn't fall in acceptable range, should be 2040000 (%1)").arg(processedUs).toLocal8Bit().constData()); QVERIFY2((audioInput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); QVERIFY2((audioInput.elapsedUSecs() == (qint64)0), "elapsedUSecs() not equal to zero in StoppedState"); - QVERIFY2((notifySignal.count() > 20 && notifySignal.count() < 40), - QString("notify() signals emitted (%1) should be 30").arg(notifySignal.count()).toLocal8Bit().constData()); + QVERIFY2(notifySignal.count() > 0, "not emitting notify() signal"); WavHeader::writeDataLength(*audioFiles.at(i),audioFiles.at(i)->pos()-WavHeader::headerLength()); audioFiles.at(i)->close(); diff --git a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp index 6e667d6d8..bd4a873d1 100755 --- a/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/integration/qaudiooutput/tst_qaudiooutput.cpp @@ -533,8 +533,7 @@ void tst_QAudioOutput::pull() QString("processedUSecs() doesn't equal file duration in us (%1)").arg(processedUs).toLocal8Bit().constData()); QVERIFY2((audioOutput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); QVERIFY2((audioOutput.elapsedUSecs() == (qint64)0), "elapsedUSecs() not equal to zero in StoppedState"); - QVERIFY2((notifySignal.count() > 15 && notifySignal.count() < 25), - QString("too many notify() signals emitted (%1)").arg(notifySignal.count()).toLocal8Bit().constData()); + QVERIFY2(notifySignal.count() > 0, "not emitting notify() signal"); audioFile->close(); @@ -719,8 +718,7 @@ void tst_QAudioOutput::push() QString("processedUSecs() doesn't equal file duration in us (%1)").arg(processedUs).toLocal8Bit().constData()); QVERIFY2((audioOutput.error() == QAudio::NoError), "error() is not QAudio::NoError after stop()"); QVERIFY2((audioOutput.elapsedUSecs() == (qint64)0), "elapsedUSecs() not equal to zero in StoppedState"); - QVERIFY2((notifySignal.count() > 15 && notifySignal.count() < 25), - QString("too many notify() signals emitted (%1)").arg(notifySignal.count()).toLocal8Bit().constData()); + QVERIFY2(notifySignal.count() > 0, "not emitting notify signal"); audioFile->close(); @@ -732,6 +730,10 @@ void tst_QAudioOutput::push() void tst_QAudioOutput::pushSuspendResume() { +#ifdef Q_OS_LINUX + if (m_inCISystem) + QSKIP("QTBUG-26504 Fails 20% of time with pulseaudio backend"); +#endif for(int i=0; i<audioFiles.count(); i++) { QAudioOutput audioOutput(testFormats.at(i), this); @@ -812,7 +814,7 @@ void tst_QAudioOutput::pushSuspendResume() audioOutput.resume(); - // Give backends running in separate threads a chance to suspend. + // Give backends running in separate threads a chance to resume. QTest::qWait(100); // Check that QAudioOutput immediately transitions to ActiveState |