qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try to stabilize the multipleTransitions test 

Change-Id: Ifeb53d6a1334623106428410aa2756935d7ba6e1
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Lars Knoll 2013-09-28 10:37:10 +02:00 committed by The Qt Project
parent 5564ba9987
commit be72aeba3d
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp
View File

@ -446,12 +446,14 @@ void tst_QQmlProfilerService::scenegraphData()
QVERIFY2(QQmlDebugTest::waitForSignal(m_client, SIGNAL(complete())), "No trace received in time.");
QVERIFY(m_client->traceMessages.count());
qDebug() << "XXX" << m_client->traceMessages.count();
// check that at least one frame was rendered
// there should be a SGPolishAndSync + SGRendererFrame + SGRenderLoopFrame sequence
// since the rendering happens in a different thread, there could be other unrelated events interleaved
int loopcheck = 0;
foreach (const QQmlProfilerData &msg, m_client->traceMessages) {
qDebug() << (msg.messageType == QQmlProfilerClient::SceneGraphFrame) << msg.messageType << msg.detailType;
if (msg.messageType == QQmlProfilerClient::SceneGraphFrame) {
if (loopcheck == 0 && msg.detailType == QQmlProfilerClient::SceneGraphContextFrame)
loopcheck = 1;

1
tests/auto/quick/qquicklistview/tst_qquicklistview.cpp
View File

@ -6578,6 +6578,7 @@ void tst_QQuickListView::multipleTransitions()
}
}
listview->forceLayout();
QTest::qWait(200);
QCOMPARE(listview->count(), model.count());
// verify all items moved to the correct final positions