diff options
author | Robert Griebl <robert.griebl@qt.io> | 2022-05-12 18:09:20 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@qt.io> | 2022-05-17 20:13:43 +0200 |
commit | 69115938f04226930a82e02cdef920c9eb873096 (patch) | |
tree | cbb0d4d57466bea27ce007ee6ae8a08ba11a29e0 /tests/auto | |
parent | 5044b7e8e465221884d9d671f0d52f07330f3207 (diff) | |
download | qtapplicationmanager-69115938f04226930a82e02cdef920c9eb873096.tar.gz |
Workaround Windows oddities in the autotests
Change-Id: I65bde7dcb44fcc36bd3dd990f1b1b69bcba4497b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/main/tst_main.cpp | 2 | ||||
-rw-r--r-- | tests/auto/qml/installer/tst_installer.qml | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/main/tst_main.cpp b/tests/auto/main/tst_main.cpp index f78aa90b..2965e72d 100644 --- a/tests/auto/main/tst_main.cpp +++ b/tests/auto/main/tst_main.cpp @@ -377,7 +377,7 @@ void tst_Main::startupTimer() QFile f(fn); QVERIFY(f.open(QIODevice::ReadOnly)); - auto report = f.readAll(); + auto report = f.readAll().replace('\r', QByteArray { }); QVERIFY(report.startsWith("\n== STARTUP TIMING REPORT: TEST ==")); QVERIFY(report.contains("after QML engine instantiation")); diff --git a/tests/auto/qml/installer/tst_installer.qml b/tests/auto/qml/installer/tst_installer.qml index ae4e8559..a2430375 100644 --- a/tests/auto/qml/installer/tst_installer.qml +++ b/tests/auto/qml/installer/tst_installer.qml @@ -120,7 +120,7 @@ TestCase { }) taskStateChangedSpy.clear(); - var id = PackageManager.startPackageInstallation(packageDir + "test-dev-signed.appkg") + var id = PackageManager.startPackageInstallation("file:" + packageDir + "test-dev-signed.appkg") taskRequestingInstallationAcknowledgeSpy.wait(spyTimeout); compare(taskRequestingInstallationAcknowledgeSpy.count, 1); compare(taskRequestingInstallationAcknowledgeSpy.signalArguments[0][0], id); @@ -140,7 +140,7 @@ TestCase { compare(PackageManager.package(pkgId).version, "1.0"); - id = PackageManager.startPackageInstallation(packageDir + "test-update-dev-signed.appkg") + id = PackageManager.startPackageInstallation("file:" + packageDir + "test-update-dev-signed.appkg") taskRequestingInstallationAcknowledgeSpy.wait(spyTimeout); compare(taskRequestingInstallationAcknowledgeSpy.count, 1); compare(taskRequestingInstallationAcknowledgeSpy.signalArguments[0][0], id); @@ -186,7 +186,7 @@ TestCase { function test_2cancel_update() { checkSkip() - var id = PackageManager.startPackageInstallation(packageDir + "test-dev-signed.appkg") + var id = PackageManager.startPackageInstallation("file:" + packageDir + "test-dev-signed.appkg") taskRequestingInstallationAcknowledgeSpy.wait(spyTimeout); compare(taskRequestingInstallationAcknowledgeSpy.count, 1); compare(taskRequestingInstallationAcknowledgeSpy.signalArguments[0][0], id); @@ -201,7 +201,7 @@ TestCase { var pkg = PackageManager.package(pkgId); compare(pkg.version, "1.0"); - id = PackageManager.startPackageInstallation(packageDir + "test-update-dev-signed.appkg") + id = PackageManager.startPackageInstallation("file:" + packageDir + "test-update-dev-signed.appkg") taskRequestingInstallationAcknowledgeSpy.wait(spyTimeout); pkgId = taskRequestingInstallationAcknowledgeSpy.signalArguments[0][1].id compare(pkgId, "com.pelagicore.test"); @@ -223,7 +223,7 @@ TestCase { compare(pkg.icon.toString().slice(-9), "icon1.png") compare(pkg.version, "v1"); - var id = PackageManager.startPackageInstallation(packageDir + "hello-world.red.appkg") + var id = PackageManager.startPackageInstallation("file:" + packageDir + "hello-world.red.appkg") taskRequestingInstallationAcknowledgeSpy.wait(spyTimeout); compare(taskRequestingInstallationAcknowledgeSpy.count, 1); compare(taskRequestingInstallationAcknowledgeSpy.signalArguments[0][0], id); @@ -243,7 +243,7 @@ TestCase { taskStateChangedSpy.clear() - var id = PackageManager.startPackageInstallation(packageDir + "hello-world.red.appkg") + var id = PackageManager.startPackageInstallation("file:" + packageDir + "hello-world.red.appkg") taskRequestingInstallationAcknowledgeSpy.wait(spyTimeout); compare(taskRequestingInstallationAcknowledgeSpy.count, 1); compare(taskRequestingInstallationAcknowledgeSpy.signalArguments[0][0], id); @@ -296,7 +296,7 @@ TestCase { applicationRunStateChangedSpy.clear() // now install the update - var id = PackageManager.startPackageInstallation(packageDir + "hello-world.red.appkg") + var id = PackageManager.startPackageInstallation("file:" + packageDir + "hello-world.red.appkg") taskBlockingUntilInstallationAcknowledgeSpy.wait(spyTimeout); compare(taskBlockingUntilInstallationAcknowledgeSpy.count, 1); compare(taskBlockingUntilInstallationAcknowledgeSpy.signalArguments[0][0], id); |