diff options
author | Bernd Weimer <bernd.weimer@pelagicore.com> | 2018-02-08 09:14:20 +0100 |
---|---|---|
committer | Dominik Holland <dominik.holland@pelagicore.com> | 2018-02-08 11:11:56 +0000 |
commit | 8764748b7df3f966ec0dcf22a42524d811d43c13 (patch) | |
tree | 4764688d084b808fd89c08173614a213eba0901d | |
parent | 12dc27d97b20c026ce86ec419942e791d27290af (diff) | |
download | qtapplicationmanager-8764748b7df3f966ec0dcf22a42524d811d43c13.tar.gz |
Fix flaky QML auto tests
Change-Id: I3be3753b03d1363f66513b9e77a1049bfa42d379
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
-rw-r--r-- | tests/qml/installer/tst_installer.qml | 9 | ||||
-rw-r--r-- | tests/qml/windowmapping/tst_windowmapping.qml | 8 |
2 files changed, 11 insertions, 6 deletions
diff --git a/tests/qml/installer/tst_installer.qml b/tests/qml/installer/tst_installer.qml index f9502e31..0145d2af 100644 --- a/tests/qml/installer/tst_installer.qml +++ b/tests/qml/installer/tst_installer.qml @@ -94,13 +94,14 @@ TestCase { applicationAddedSpy.wait(2000); var appId = applicationAddedSpy.signalArguments[0][0]; var app = AM.ApplicationManager.application(appId); - compare(app.state, AM.Application.BeingInstalled) stateChangedSpy.target = app; - stateChangedSpy.wait(2000); - compare(stateChangedSpy.signalArguments[0][0], AM.Application.Installed) + if (app.state === AM.Application.BeingInstalled) { + stateChangedSpy.wait(2000); + compare(stateChangedSpy.signalArguments[0][0], AM.Application.Installed) + } compare(app.state, AM.Application.Installed) - var id = AM.ApplicationInstaller.startPackageInstallation("internal-0", "appv2.pkg") + id = AM.ApplicationInstaller.startPackageInstallation("internal-0", "appv2.pkg") taskRequestingInstallationAcknowledgeSpy.wait(2000); compare(taskRequestingInstallationAcknowledgeSpy.count, 1); compare(taskRequestingInstallationAcknowledgeSpy.signalArguments[0][0], id); diff --git a/tests/qml/windowmapping/tst_windowmapping.qml b/tests/qml/windowmapping/tst_windowmapping.qml index 1a40c798..197199de 100644 --- a/tests/qml/windowmapping/tst_windowmapping.qml +++ b/tests/qml/windowmapping/tst_windowmapping.qml @@ -120,7 +120,9 @@ TestCase { compare(windowReadySpy.count, 0); ApplicationManager.startApplication(appId, "show-main"); - windowReadySpy.wait(3000); + windowReadySpy.wait(2000); + if (windowReadySpy.count === 1) + windowReadySpy.wait(2000); compare(windowReadySpy.count, 2); } @@ -130,7 +132,9 @@ TestCase { appId = "test.winmap.loader"; ApplicationManager.startApplication(appId, "show-sub"); - windowReadySpy.wait(3000); + windowReadySpy.wait(2000); + if (windowReadySpy.count === 1) + windowReadySpy.wait(2000); compare(windowReadySpy.count, 2); windowReadySpy.clear(); |