Migrate QFtp test to new test server

Use docker test server to run test, following instructions on
https://wiki.qt.io/Network_Testing. Verified on Ubunutu 18.04.

Several test failures due to network timeouts and inconsistent
configuration of FTP server and assumptions made in the tests.
However, the test is either way blacklisted, and the docker test
server is not in use yet.

Done-with: Ryan Chu <ryan.chu@qt.io>
Fixes: QTQAINFRA-2275
Change-Id: I4cbd0109ce3f4cfb23ba2303a85796681d12febc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

2 files changed, 94 insertions, 84 deletions

diff --git a/tests/auto/network/access/qftp/qftp.pro b/tests/auto/network/access/qftp/qftp.pro
index 1959c1acac..c78020c5f8 100644
--- a/tests/auto/network/access/qftp/qftp.pro
+++ b/tests/auto/network/access/qftp/qftp.pro
@@ -4,3 +4,6 @@ SOURCES  += tst_qftp.cpp
 
 requires(qtConfig(private_tests))
 QT = core network network-private testlib
+
+CONFIG += unsupported/testserver
+QT_TEST_SERVER_LIST = vsftpd ftp-proxy squid danted
diff --git a/tests/auto/network/access/qftp/tst_qftp.cpp b/tests/auto/network/access/qftp/tst_qftp.cpp
index 6e18e1a663..ec7bcd25e2 100644
--- a/tests/auto/network/access/qftp/tst_qftp.cpp
+++ b/tests/auto/network/access/qftp/tst_qftp.cpp
@@ -208,7 +208,14 @@ void tst_QFtp::initTestCase_data()
 
 void tst_QFtp::initTestCase()
 {
+#if defined(QT_TEST_SERVER)
+    QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::ftpServerName(), 21));
+    QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::ftpProxyServerName(), 2121));
+    QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::socksProxyServerName(), 1080));
+    QVERIFY(QtNetworkSettings::verifyConnection(QtNetworkSettings::httpProxyServerName(), 3128));
+#else
     QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
+#endif
 #ifndef QT_NO_BEARERMANAGEMENT
     QNetworkConfigurationManager manager;
     networkSessionImplicit = QSharedPointer<QNetworkSession>::create(manager.defaultConfiguration());
@@ -235,9 +242,9 @@ void tst_QFtp::init()
     if (setProxy) {
 #ifndef QT_NO_NETWORKPROXY
         if (proxyType == QNetworkProxy::Socks5Proxy) {
-            QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, QtNetworkSettings::serverName(), 1080));
+            QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::Socks5Proxy, QtNetworkSettings::socksProxyServerName(), 1080));
         } else if (proxyType == QNetworkProxy::HttpProxy) {
-            QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::HttpProxy, QtNetworkSettings::serverName(), 3128));
+            QNetworkProxy::setApplicationProxy(QNetworkProxy(QNetworkProxy::HttpProxy, QtNetworkSettings::httpProxyServerName(), 3128));
         }
 #else // !QT_NO_NETWORKPROXY
         Q_UNUSED(proxyType);
@@ -316,8 +323,8 @@ void tst_QFtp::connectToHost_data()
     QTest::addColumn<uint>("port");
     QTest::addColumn<int>("state");
 
-    QTest::newRow( "ok01" ) << QtNetworkSettings::serverName() << (uint)21 << (int)QFtp::Connected;
-    QTest::newRow( "error01" ) << QtNetworkSettings::serverName() << (uint)2222 << (int)QFtp::Unconnected;
+    QTest::newRow( "ok01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << (int)QFtp::Connected;
+    QTest::newRow( "error01" ) << QtNetworkSettings::ftpServerName() << (uint)2222 << (int)QFtp::Unconnected;
     QTest::newRow( "error02" ) << QString("foo.bar") << (uint)21 << (int)QFtp::Unconnected;
 }
 
@@ -402,13 +409,13 @@ void tst_QFtp::login_data()
     QTest::addColumn<QString>("password");
     QTest::addColumn<int>("success");
 
-    QTest::newRow( "ok01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << 1;
-    QTest::newRow( "ok02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftp") << QString("") << 1;
-    QTest::newRow( "ok03" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftp") << QString("foo") << 1;
-    QTest::newRow( "ok04" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest") << QString("password") << 1;
+    QTest::newRow( "ok01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << 1;
+    QTest::newRow( "ok02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftp") << QString("") << 1;
+    QTest::newRow( "ok03" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftp") << QString("foo") << 1;
+    QTest::newRow( "ok04" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") << 1;
 
-    QTest::newRow( "error01" ) << QtNetworkSettings::serverName() << (uint)21 << QString("foo") << QString("") << 0;
-    QTest::newRow( "error02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("foo") << QString("bar") << 0;
+    QTest::newRow( "error01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("foo") << QString("") << 0;
+    QTest::newRow( "error02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("foo") << QString("bar") << 0;
 }
 
 void tst_QFtp::login()
@@ -448,12 +455,12 @@ void tst_QFtp::close_data()
     QTest::addColumn<QString>("password");
     QTest::addColumn<bool>("login");
 
-    QTest::newRow( "login01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << true;
-    QTest::newRow( "login02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftp") << QString() << true;
-    QTest::newRow( "login03" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftp") << QString("foo") << true;
-    QTest::newRow( "login04" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest") << QString("password") << true;
+    QTest::newRow( "login01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << true;
+    QTest::newRow( "login02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftp") << QString() << true;
+    QTest::newRow( "login03" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftp") << QString("foo") << true;
+    QTest::newRow( "login04" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest") << QString("password") << true;
 
-    QTest::newRow( "no-login01" ) << QtNetworkSettings::serverName() << (uint)21 << QString("") << QString("") << false;
+    QTest::newRow( "no-login01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("") << QString("") << false;
 }
 
 void tst_QFtp::close()
@@ -503,17 +510,17 @@ void tst_QFtp::list_data()
     flukeQtest << "rfc3252.txt";
     flukeQtest << "upload";
 
-    QTest::newRow( "workDir01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString() << 1 << flukeRoot;
-    QTest::newRow( "workDir02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")     << QString() << 1 << flukeRoot;
+    QTest::newRow( "workDir01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString() << 1 << flukeRoot;
+    QTest::newRow( "workDir02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")     << QString() << 1 << flukeRoot;
 
-    QTest::newRow( "relPath01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("qtest") << 1 << flukeQtest;
-    QTest::newRow( "relPath02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")     << QString("qtest") << 1 << flukeQtest;
+    QTest::newRow( "relPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("qtest") << 1 << flukeQtest;
+    QTest::newRow( "relPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")     << QString("qtest") << 1 << flukeQtest;
 
-    QTest::newRow( "absPath01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("/qtest") << 1 << flukeQtest;
-    QTest::newRow( "absPath02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")     << QString("/var/ftp/qtest") << 1 << flukeQtest;
+    QTest::newRow( "absPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("/qtest") << 1 << flukeQtest;
+    QTest::newRow( "absPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")     << QString("/var/ftp/qtest") << 1 << flukeQtest;
 
-    QTest::newRow( "nonExist01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("foo")  << 1 << QStringList();
-    QTest::newRow( "nonExist02" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("/foo") << 1 << QStringList();
+    QTest::newRow( "nonExist01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("foo")  << 1 << QStringList();
+    QTest::newRow( "nonExist02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("/foo") << 1 << QStringList();
     // ### The microsoft server does not seem to work properly at the moment --
     // I am also not able to open a data connection with other, non-Qt FTP
     // clients to it.
@@ -573,14 +580,14 @@ void tst_QFtp::cd_data()
     flukeQtest << "rfc3252.txt";
     flukeQtest << "upload";
 
-    QTest::newRow( "relPath01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("qtest") << 1 << flukeQtest;
-    QTest::newRow( "relPath02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")     << QString("qtest") << 1 << flukeQtest;
+    QTest::newRow( "relPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("qtest") << 1 << flukeQtest;
+    QTest::newRow( "relPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")     << QString("qtest") << 1 << flukeQtest;
 
-    QTest::newRow( "absPath01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("/qtest") << 1 << flukeQtest;
-    QTest::newRow( "absPath02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")     << QString("/var/ftp/qtest") << 1 << flukeQtest;
+    QTest::newRow( "absPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("/qtest") << 1 << flukeQtest;
+    QTest::newRow( "absPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")     << QString("/var/ftp/qtest") << 1 << flukeQtest;
 
-    QTest::newRow( "nonExist01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("foo")  << 0 << QStringList();
-    QTest::newRow( "nonExist03" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("/foo") << 0 << QStringList();
+    QTest::newRow( "nonExist01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("foo")  << 0 << QStringList();
+    QTest::newRow( "nonExist03" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("/foo") << 0 << QStringList();
 }
 
 void tst_QFtp::cd()
@@ -635,19 +642,19 @@ void tst_QFtp::get_data()
     // test the two get() overloads in one routine
     for ( int i=0; i<2; i++ ) {
         const QByteArray iB = QByteArray::number(i);
-        QTest::newRow(("relPath01_" + iB).constData()) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString()
+        QTest::newRow(("relPath01_" + iB).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString()
                 << "qtest/rfc3252" << 1 << rfc3252 << (bool)(i==1);
-        QTest::newRow(("relPath02_" + iB).constData()) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")
+        QTest::newRow(("relPath02_" + iB).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")
                 << "qtest/rfc3252" << 1 << rfc3252 << (bool)(i==1);
 
-        QTest::newRow(("absPath01_" + iB).constData()) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString()
+        QTest::newRow(("absPath01_" + iB).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString()
                 << "/qtest/rfc3252" << 1 << rfc3252 << (bool)(i==1);
-        QTest::newRow(("absPath02_" + iB).constData()) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")
+        QTest::newRow(("absPath02_" + iB).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")
                 << "/var/ftp/qtest/rfc3252" << 1 << rfc3252 << (bool)(i==1);
 
-        QTest::newRow(("nonExist01_" + iB).constData()) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString()
+        QTest::newRow(("nonExist01_" + iB).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString()
                 << QString("foo")  << 0 << QByteArray() << (bool)(i==1);
-        QTest::newRow(("nonExist02_" + iB).constData()) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString()
+        QTest::newRow(("nonExist02_" + iB).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString()
                 << QString("/foo") << 0 << QByteArray() << (bool)(i==1);
     }
 }
@@ -727,31 +734,31 @@ void tst_QFtp::put_data()
     // test the two put() overloads in one routine with a file name containing
     // U+0x00FC (latin small letter u with diaeresis) for QTBUG-52303, testing UTF-8
     for ( int i=0; i<2; i++ ) {
-        QTest::newRow(("relPath01_" + QByteArray::number(i)).constData()) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString()
+        QTest::newRow(("relPath01_" + QByteArray::number(i)).constData()) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString()
                 << (QLatin1String("qtest/upload/rel01_") + QChar(0xfc) + QLatin1String("%1")) << rfc3252
                 << (bool)(i==1) << 1;
         /*
-    QTest::newRow( QString("relPath02_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")
+    QTest::newRow( QString("relPath02_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")
         << QString("qtest/upload/rel02_%1") << rfc3252
         << (bool)(i==1) << 1;
-    QTest::newRow( QString("relPath03_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")
+    QTest::newRow( QString("relPath03_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")
         << QString("qtest/upload/rel03_%1") << QByteArray()
         << (bool)(i==1) << 1;
-    QTest::newRow( QString("relPath04_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")
+    QTest::newRow( QString("relPath04_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")
         << QString("qtest/upload/rel04_%1") << bigData
         << (bool)(i==1) << 1;
 
-    QTest::newRow( QString("absPath01_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString()
+    QTest::newRow( QString("absPath01_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString()
         << QString("/qtest/upload/abs01_%1") << rfc3252
         << (bool)(i==1) << 1;
-    QTest::newRow( QString("absPath02_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")
+    QTest::newRow( QString("absPath02_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")
         << QString("/srv/ftp/qtest/upload/abs02_%1") << rfc3252
         << (bool)(i==1) << 1;
 
-    QTest::newRow( QString("nonExist01_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString()
+    QTest::newRow( QString("nonExist01_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString()
         << QString("foo")  << QByteArray()
         << (bool)(i==1) << 0;
-    QTest::newRow( QString("nonExist02_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString()
+    QTest::newRow( QString("nonExist02_%1").arg(i).toLatin1().constData() ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString()
         << QString("/foo") << QByteArray()
         << (bool)(i==1) << 0;
 */
@@ -877,22 +884,22 @@ void tst_QFtp::mkdir_data()
     QTest::addColumn<QString>("dirToCreate");
     QTest::addColumn<int>("success");
 
-    QTest::newRow( "relPath01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString()
+    QTest::newRow( "relPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString()
             << "qtest/upload" << QString("rel01_%1") << 1;
-    QTest::newRow( "relPath02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")
+    QTest::newRow( "relPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")
             << "qtest/upload" << QString("rel02_%1") << 1;
-    QTest::newRow( "relPath03" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")
+    QTest::newRow( "relPath03" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")
             << "qtest/upload" << QString("rel03_%1") << 1;
 
-    QTest::newRow( "absPath01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString()
+    QTest::newRow( "absPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString()
             << "." << QString("/qtest/upload/abs01_%1") << 1;
-    QTest::newRow( "absPath02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")
+    QTest::newRow( "absPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")
             << "." << QString("/var/ftp/qtest/upload/abs02_%1") << 1;
 
-    //    QTest::newRow( "nonExist01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("foo")  << 0;
-    QTest::newRow( "nonExist01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString()
+    //    QTest::newRow( "nonExist01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("foo")  << 0;
+    QTest::newRow( "nonExist01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString()
             << "." << QString("foo")  << 0;
-    QTest::newRow( "nonExist02" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString()
+    QTest::newRow( "nonExist02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString()
             << "." << QString("/foo") << 0;
 }
 
@@ -979,7 +986,7 @@ void tst_QFtp::mkdir()
 void tst_QFtp::mkdir2()
 {
     ftp = new QFtp;
-    ftp->connectToHost(QtNetworkSettings::serverName());
+    ftp->connectToHost(QtNetworkSettings::ftpServerName());
     ftp->login();
     current_id = ftp->cd("kake/test");
 
@@ -1026,39 +1033,39 @@ void tst_QFtp::rename_data()
     QTest::addColumn<QString>("renamedFile");
     QTest::addColumn<int>("success");
 
-    QTest::newRow("relPath01") << QtNetworkSettings::serverName() << QString() << QString()
+    QTest::newRow("relPath01") << QtNetworkSettings::ftpServerName() << QString() << QString()
             << "qtest/upload"
             << QString("rel_old01_%1") << QString("rel_new01_%1")
             << QString("qtest/upload/rel_old01_%1") << QString("qtest/upload/rel_new01_%1")
             << 1;
-    QTest::newRow("relPath02") << QtNetworkSettings::serverName() << QString("ftptest")     << "password"
+    QTest::newRow("relPath02") << QtNetworkSettings::ftpServerName() << QString("ftptest")     << "password"
             << "qtest/upload"
             << QString("rel_old02_%1") << QString("rel_new02_%1")
             << QString("qtest/upload/rel_old02_%1") << QString("qtest/upload/rel_new02_%1")
             << 1;
-    QTest::newRow("relPath03") << QtNetworkSettings::serverName() << QString("ftptest")     << "password"
+    QTest::newRow("relPath03") << QtNetworkSettings::ftpServerName() << QString("ftptest")     << "password"
             << "qtest/upload"
             << QString("rel_old03_%1")<< QString("rel_new03_%1")
             << QString("qtest/upload/rel_old03_%1") << QString("qtest/upload/rel_new03_%1")
             << 1;
 
-    QTest::newRow("absPath01") << QtNetworkSettings::serverName() << QString() << QString()
+    QTest::newRow("absPath01") << QtNetworkSettings::ftpServerName() << QString() << QString()
             << QString()
             << QString("/qtest/upload/abs_old01_%1") << QString("/qtest/upload/abs_new01_%1")
             << QString("/qtest/upload/abs_old01_%1") << QString("/qtest/upload/abs_new01_%1")
             << 1;
-    QTest::newRow("absPath02") << QtNetworkSettings::serverName() << QString("ftptest")     << "password"
+    QTest::newRow("absPath02") << QtNetworkSettings::ftpServerName() << QString("ftptest")     << "password"
             << QString()
             << QString("/var/ftp/qtest/upload/abs_old02_%1") << QString("/var/ftp/qtest/upload/abs_new02_%1")
             << QString("/var/ftp/qtest/upload/abs_old02_%1") << QString("/var/ftp/qtest/upload/abs_new02_%1")
             << 1;
 
-    QTest::newRow("nonExist01") << QtNetworkSettings::serverName() << QString() << QString()
+    QTest::newRow("nonExist01") << QtNetworkSettings::ftpServerName() << QString() << QString()
             << QString()
             << QString("foo") << "new_foo"
             << QString() << QString()
             << 0;
-    QTest::newRow("nonExist02") << QtNetworkSettings::serverName() << QString() << QString()
+    QTest::newRow("nonExist02") << QtNetworkSettings::ftpServerName() << QString() << QString()
             << QString()
             << QString("/foo") << QString("/new_foo")
             << QString() << QString()
@@ -1220,7 +1227,7 @@ void tst_QFtp::commandSequence_data()
 {
     // some "constants"
     QStringList argConnectToHost01;
-    argConnectToHost01 << QtNetworkSettings::serverName() << "21";
+    argConnectToHost01 << QtNetworkSettings::ftpServerName() << "21";
 
     QStringList argLogin01, argLogin02, argLogin03, argLogin04;
     argLogin01 << QString() << QString();
@@ -1351,13 +1358,13 @@ void tst_QFtp::abort_data()
     QTest::addColumn<QString>("file");
     QTest::addColumn<QByteArray>("uploadData");
 
-    QTest::newRow( "get_fluke01" ) << QtNetworkSettings::serverName() << (uint)21 << QString("qtest/bigfile") << QByteArray();
-    QTest::newRow( "get_fluke02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("qtest/rfc3252") << QByteArray();
+    QTest::newRow( "get_fluke01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("qtest/bigfile") << QByteArray();
+    QTest::newRow( "get_fluke02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("qtest/rfc3252") << QByteArray();
 
     // Qt/CE test environment has too little memory for this test
     QByteArray bigData( 10*1024*1024, 0 );
     bigData.fill( 'B' );
-    QTest::newRow( "put_fluke01" ) << QtNetworkSettings::serverName() << (uint)21 << QString("qtest/upload/abort_put") << bigData;
+    QTest::newRow( "put_fluke01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("qtest/upload/abort_put") << bigData;
 }
 
 void tst_QFtp::abort()
@@ -1402,7 +1409,7 @@ void tst_QFtp::abort()
     if ( it.value().success ) {
         // The FTP server on fluke is sadly returning a success, even when
         // the operation was aborted. So we have to use some heuristics.
-        if ( host == QtNetworkSettings::serverName() ) {
+        if ( host == QtNetworkSettings::ftpServerName() ) {
             if ( cmd == QFtp::Get ) {
                 QVERIFY2(bytesDone <= bytesTotal, msgComparison(bytesDone, "<=", bytesTotal));
             } else {
@@ -1449,11 +1456,11 @@ void tst_QFtp::bytesAvailable_data()
     QTest::addColumn<qlonglong>("bytesAvailFinished");
     QTest::addColumn<qlonglong>("bytesAvailDone");
 
-    QTest::newRow( "fluke01" ) << QtNetworkSettings::serverName() << QString("qtest/bigfile") << 0 << (qlonglong)519240 << (qlonglong)519240 << (qlonglong)519240;
-    QTest::newRow( "fluke02" ) << QtNetworkSettings::serverName() << QString("qtest/rfc3252") << 0 << (qlonglong)25962 << (qlonglong)25962 << (qlonglong)25962;
+    QTest::newRow( "fluke01" ) << QtNetworkSettings::ftpServerName() << QString("qtest/bigfile") << 0 << (qlonglong)519240 << (qlonglong)519240 << (qlonglong)519240;
+    QTest::newRow( "fluke02" ) << QtNetworkSettings::ftpServerName() << QString("qtest/rfc3252") << 0 << (qlonglong)25962 << (qlonglong)25962 << (qlonglong)25962;
 
-    QTest::newRow( "fluke03" ) << QtNetworkSettings::serverName() << QString("qtest/bigfile") << 1 << (qlonglong)519240 << (qlonglong)0 << (qlonglong)0;
-    QTest::newRow( "fluke04" ) << QtNetworkSettings::serverName() << QString("qtest/rfc3252") << 1 << (qlonglong)25962 << (qlonglong)0 << (qlonglong)0;
+    QTest::newRow( "fluke03" ) << QtNetworkSettings::ftpServerName() << QString("qtest/bigfile") << 1 << (qlonglong)519240 << (qlonglong)0 << (qlonglong)0;
+    QTest::newRow( "fluke04" ) << QtNetworkSettings::ftpServerName() << QString("qtest/rfc3252") << 1 << (qlonglong)25962 << (qlonglong)0 << (qlonglong)0;
 }
 
 void tst_QFtp::bytesAvailable()
@@ -1498,7 +1505,7 @@ void tst_QFtp::activeMode()
     file.open(QIODevice::ReadWrite);
     QFtp ftp;
     ftp.setTransferMode(QFtp::Active);
-    ftp.connectToHost(QtNetworkSettings::serverName(), 21);
+    ftp.connectToHost(QtNetworkSettings::ftpServerName(), 21);
     ftp.login();
     ftp.list();
     ftp.get("/qtest/rfc3252.txt", &file);
@@ -1534,14 +1541,14 @@ void tst_QFtp::proxy_data()
     flukeQtest << "rfc3252.txt";
     flukeQtest << "upload";
 
-    QTest::newRow( "proxy_relPath01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("qtest") << 1 << flukeQtest;
-    QTest::newRow( "proxy_relPath02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")     << QString("qtest") << 1 << flukeQtest;
+    QTest::newRow( "proxy_relPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("qtest") << 1 << flukeQtest;
+    QTest::newRow( "proxy_relPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")     << QString("qtest") << 1 << flukeQtest;
 
-    QTest::newRow( "proxy_absPath01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("/qtest") << 1 << flukeQtest;
-    QTest::newRow( "proxy_absPath02" ) << QtNetworkSettings::serverName() << (uint)21 << QString("ftptest")     << QString("password")     << QString("/var/ftp/qtest") << 1 << flukeQtest;
+    QTest::newRow( "proxy_absPath01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("/qtest") << 1 << flukeQtest;
+    QTest::newRow( "proxy_absPath02" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString("ftptest")     << QString("password")     << QString("/var/ftp/qtest") << 1 << flukeQtest;
 
-    QTest::newRow( "proxy_nonExist01" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("foo")  << 0 << QStringList();
-    QTest::newRow( "proxy_nonExist03" ) << QtNetworkSettings::serverName() << (uint)21 << QString() << QString() << QString("/foo") << 0 << QStringList();
+    QTest::newRow( "proxy_nonExist01" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("foo")  << 0 << QStringList();
+    QTest::newRow( "proxy_nonExist03" ) << QtNetworkSettings::ftpServerName() << (uint)21 << QString() << QString() << QString("/foo") << 0 << QStringList();
 }
 
 void tst_QFtp::proxy()
@@ -1553,7 +1560,7 @@ void tst_QFtp::proxy()
     QFETCH( QString, dir );
 
     ftp = newFtp();
-    addCommand( QFtp::SetProxy, ftp->setProxy( QtNetworkSettings::serverName(), 2121 ) );
+    addCommand( QFtp::SetProxy, ftp->setProxy( QtNetworkSettings::ftpProxyServerName(), 2121 ) );
     addCommand( QFtp::ConnectToHost, ftp->connectToHost( host, port ) );
     addCommand( QFtp::Login, ftp->login( user, password ) );
     addCommand( QFtp::Cd, ftp->cd( dir ) );
@@ -1589,7 +1596,7 @@ void tst_QFtp::binaryAscii()
 
     init();
     ftp = newFtp();
-    addCommand(QFtp::ConnectToHost, ftp->connectToHost(QtNetworkSettings::serverName(), 21));
+    addCommand(QFtp::ConnectToHost, ftp->connectToHost(QtNetworkSettings::ftpServerName(), 21));
     addCommand(QFtp::Login, ftp->login("ftptest", "password"));
     addCommand(QFtp::Cd, ftp->cd("qtest/upload"));
     addCommand(QFtp::Put, ftp->put(putData, file, QFtp::Ascii));
@@ -1599,7 +1606,7 @@ void tst_QFtp::binaryAscii()
     delete ftp;
     ftp = 0;
     if ( QTestEventLoop::instance().timeout() )
-        QFAIL( msgTimedOut(QtNetworkSettings::serverName()) );
+        QFAIL( msgTimedOut(QtNetworkSettings::ftpServerName()) );
 
     ResMapIt it = resultMap.find(QFtp::Put);
     QVERIFY(it != resultMap.end());
@@ -1611,7 +1618,7 @@ void tst_QFtp::binaryAscii()
 
     init();
     ftp = newFtp();
-    addCommand(QFtp::ConnectToHost, ftp->connectToHost(QtNetworkSettings::serverName(), 21));
+    addCommand(QFtp::ConnectToHost, ftp->connectToHost(QtNetworkSettings::ftpServerName(), 21));
     addCommand(QFtp::Login, ftp->login("ftptest", "password"));
     addCommand(QFtp::Cd, ftp->cd("qtest/upload"));
     addCommand(QFtp::Get, ftp->get(file, &getBuf, QFtp::Binary));
@@ -1621,7 +1628,7 @@ void tst_QFtp::binaryAscii()
     delete ftp;
     ftp = 0;
     if ( QTestEventLoop::instance().timeout() )
-        QFAIL( msgTimedOut(QtNetworkSettings::serverName()) );
+        QFAIL( msgTimedOut(QtNetworkSettings::ftpServerName()) );
 
     ResMapIt it2 = resultMap.find(QFtp::Get);
     QVERIFY(it2 != resultMap.end());
@@ -1634,7 +1641,7 @@ void tst_QFtp::binaryAscii()
     // cleanup (i.e. remove the file) -- this also tests the remove command
     init();
     ftp = newFtp();
-    addCommand(QFtp::ConnectToHost, ftp->connectToHost(QtNetworkSettings::serverName(), 21));
+    addCommand(QFtp::ConnectToHost, ftp->connectToHost(QtNetworkSettings::ftpServerName(), 21));
     addCommand(QFtp::Login, ftp->login("ftptest", "password"));
     addCommand(QFtp::Cd, ftp->cd("qtest/upload"));
     addCommand(QFtp::Remove, ftp->remove(file));
@@ -1644,13 +1651,13 @@ void tst_QFtp::binaryAscii()
     delete ftp;
     ftp = 0;
     if ( QTestEventLoop::instance().timeout() )
-        QFAIL( msgTimedOut(QtNetworkSettings::serverName()) );
+        QFAIL( msgTimedOut(QtNetworkSettings::ftpServerName()) );
 
     it = resultMap.find( QFtp::Remove );
     QVERIFY( it != resultMap.end() );
     QCOMPARE( it.value().success, 1 );
 
-    QVERIFY(!fileExists(QtNetworkSettings::serverName(), 21, "ftptest", "password", file));
+    QVERIFY(!fileExists(QtNetworkSettings::ftpServerName(), 21, "ftptest", "password", file));
 }
 
 
@@ -2067,7 +2074,7 @@ void tst_QFtp::doneSignal()
     QFtp ftp;
     QSignalSpy spy(&ftp, SIGNAL(done(bool)));
 
-    ftp.connectToHost(QtNetworkSettings::serverName());
+    ftp.connectToHost(QtNetworkSettings::ftpServerName());
     ftp.login("anonymous");
     ftp.list();
     ftp.close();