feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Process test: Fix flakiness on linux / mac

Browse Source 
Since it's not clear why the flakiness existed, leave a TODO note.

Change-Id: Ief1104870c008e056d5b87880b508fd66266bce4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
This commit is contained in:
Jarek Kobus
2024-01-04 20:13:14 +01:00
parent b3bdbf395b
commit bc3e30e7ec
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/utils/process/tst_process.cpp
View File

@@ -258,6 +258,8 @@ static QByteArray readData(Process *process, QProcess::ProcessChannel processCha
QByteArray buffer = processChannel == QProcess::StandardOutput QByteArray buffer = processChannel == QProcess::StandardOutput
? process->readAllRawStandardOutput() : process->readAllRawStandardError(); ? process->readAllRawStandardOutput() : process->readAllRawStandardError();
buffer.replace("\r\n", "\n"); // Needed for Windows only buffer.replace("\r\n", "\n"); // Needed for Windows only
if (buffer.endsWith('\n'))
buffer.chop(1); // TODO: otherwise it's flaky on linux / mac, investigate why?
return buffer; return buffer;
} }
@@ -280,12 +282,12 @@ void tst_Process::multiRead()
process.writeRaw("hi\n"); process.writeRaw("hi\n");
QVERIFY(process.waitForReadyRead(1000)); QVERIFY(process.waitForReadyRead(1000));
buffer = readData(&process, processChannel); buffer = readData(&process, processChannel);
QCOMPARE(buffer, QByteArray("hi\n")); QCOMPARE(buffer, QByteArray("hi"));
process.writeRaw("you\n"); process.writeRaw("you\n");
QVERIFY(process.waitForReadyRead(1000)); QVERIFY(process.waitForReadyRead(1000));
buffer = readData(&process, processChannel); buffer = readData(&process, processChannel);
QCOMPARE(buffer, QByteArray("you\n")); QCOMPARE(buffer, QByteArray("you"));
process.writeRaw("exit\n"); process.writeRaw("exit\n");
QVERIFY(process.waitForFinished(1000)); QVERIFY(process.waitForFinished(1000));