remove redundant forwardedChannels() test

forwardedChannelsOutput() actually tests forwarding. also having the
older test only eats CPU cycles.
rename the new test to the old name for clarity.

Change-Id: I16a326c8692bb594d7df7897bc53d31b23c66d90
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
This commit is contained in:
Oswald Buddenhagen 2013-09-03 18:52:05 +02:00 committed by The Qt Project
parent 4028f54213
commit 78d6c9c002

View File

@ -108,7 +108,6 @@ private slots:
void softExitInSlots();
void mergedChannels();
void forwardedChannels();
void forwardedChannelsOutput();
void atEnd();
void atEnd2();
void waitForFinishedWithTimeout();
@ -1091,26 +1090,6 @@ void tst_QProcess::mergedChannels()
#ifndef Q_OS_WINCE
// Reading and writing to a process is not supported on Qt/CE
void tst_QProcess::forwardedChannels()
{
QProcess process;
process.setReadChannelMode(QProcess::ForwardedChannels);
QCOMPARE(process.readChannelMode(), QProcess::ForwardedChannels);
process.start("testProcessEcho2/testProcessEcho2");
QVERIFY(process.waitForStarted(5000));
QCOMPARE(process.write("forwarded\n"), qlonglong(10));
QVERIFY(!process.waitForReadyRead(250));
QCOMPARE(process.bytesAvailable(), qlonglong(0));
process.closeWriteChannel();
QVERIFY(process.waitForFinished(5000));
}
#endif
#ifndef Q_OS_WINCE
// Reading and writing to a process is not supported on Qt/CE
void tst_QProcess::forwardedChannelsOutput()
{
QProcess process;
process.start("testForwarding/testForwarding");