summaryrefslogtreecommitdiffstats
path: root/tests/auto/network/access/qftp
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-19 12:53:13 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-21 01:20:29 +0200
commit27f9f136f7e39b5d612bc02f7ff8778ab424c07d (patch)
tree3c72358e3d1e42fbf0c386365e76db259e180bd7 /tests/auto/network/access/qftp
parent016cd01846539404a0eff1e3823fa2206fe2c9a9 (diff)
Remove SkipMode parameter from QSKIP calls.
The previous commit removed SkipMode from the testlib APi. This commit removes the parameter from all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/network/access/qftp')
-rw-r--r--tests/auto/network/access/qftp/tst_qftp.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp
index d88ce676e2..87a4dbfc02 100644
--- a/tests/auto/network/access/qftp/tst_qftp.cpp
+++ b/tests/auto/network/access/qftp/tst_qftp.cpp
@@ -350,7 +350,7 @@ void tst_QFtp::connectToUnresponsiveHost()
{
QFETCH_GLOBAL(bool, setProxy);
if (setProxy)
- QSKIP( "This test takes too long if we test with proxies too", SkipSingle );
+ QSKIP( "This test takes too long if we test with proxies too");
QString host = "192.0.2.42"; // IP out of TEST-NET, should be unreachable
uint port = 21;
@@ -759,9 +759,8 @@ void tst_QFtp::put()
QFETCH_GLOBAL(bool, setProxy);
if (setProxy) {
QFETCH_GLOBAL(int, proxyType);
- if (proxyType == QNetworkProxy::Socks5Proxy) {
- QSKIP("With socks5 the put() test takes too long time on Windows.", SkipAll);
- }
+ if (proxyType == QNetworkProxy::Socks5Proxy)
+ QSKIP("With socks5 the put() test takes too long time on Windows.");
}
#endif
@@ -2075,7 +2074,7 @@ void tst_QFtp::doneSignal()
void tst_QFtp::queueMoreCommandsInDoneSlot()
{
- QSKIP("Task 127050 && 113966", SkipSingle);
+ QSKIP("Task 127050 && 113966");
QFtp ftp;
QSignalSpy doneSpy(&ftp, SIGNAL(done(bool)));