Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 533c0044 authored by Albert Astals Cid's avatar Albert Astals Cid

Merge remote-tracking branch 'origin/Applications/16.12'

parents ef860fb1 964e3eb2
......@@ -309,7 +309,7 @@ void MainShellTest::testShell()
if (useTabs || unique)
{
// It is attaching to us, so will eventually stop
QTRY_COMPARE_WITH_TIMEOUT(p.state(), QProcess::NotRunning, 2000);
QTRY_COMPARE_WITH_TIMEOUT(p.state(), QProcess::NotRunning, 20000);
QCOMPARE(p.exitStatus(), QProcess::NormalExit);
QCOMPARE(p.exitCode(), 0);
......@@ -442,7 +442,7 @@ void MainShellTest::testFileRemembersPagePosition()
QCOMPARE(p.state(), QProcess::Running);
// It is attaching to us, so will eventually stop
QTRY_COMPARE_WITH_TIMEOUT((int)p.state(), (int)QProcess::NotRunning, 2000);
QTRY_COMPARE_WITH_TIMEOUT((int)p.state(), (int)QProcess::NotRunning, 20000);
QCOMPARE((int)p.exitStatus(), (int)QProcess::NormalExit);
QCOMPARE(p.exitCode(), 0);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment