summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-09-03 18:52:05 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-05 11:18:59 +0200
commit78d6c9c0020dc892a99cd644fdb8f84028bc5655 (patch)
treeb88caface83d75c7054671c99ade2922b43d50f6 /tests/auto
parent4028f54213c26bb1952415879afc6b5c76bfe038 (diff)
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>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/corelib/io/qprocess/tst_qprocess.cpp21
1 files changed, 0 insertions, 21 deletions
diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
index 65716347c7..183f827836 100644
--- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
+++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp
@@ -108,7 +108,6 @@ private slots:
void softExitInSlots();
void mergedChannels();
void forwardedChannels();
- void forwardedChannelsOutput();
void atEnd();
void atEnd2();
void waitForFinishedWithTimeout();
@@ -1093,26 +1092,6 @@ void tst_QProcess::mergedChannels()
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");
QVERIFY(process.waitForStarted(5000));
QVERIFY(process.waitForFinished(5000));