From 4d1cbe39ab8962498b3aee4d732d6c9357cdbbe7 Mon Sep 17 00:00:00 2001
From: Frederik Gladhorn <frederik.gladhorn@digia.com>
Date: Tue, 11 Mar 2014 14:13:53 +0100
Subject: Fix network tests relying on troll.no

Replacing old troll.no domain with qt-project.org domain. Using troll.no
doesn't work anymore.

Cherry-picked from e5785d6322051ba96b1a4a97963a64c1aabbc027 in qtbase

Change-Id: Ib849205e3c8d254e4b0dfc8ed1c396259122481a
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp | 2 +-
 tests/auto/qnetworkreply/tst_qnetworkreply.cpp                   | 6 +++---
 tests/auto/qtcpserver/tst_qtcpserver.cpp                         | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
index 31474e4a49..0816439884 100644
--- a/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
+++ b/tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp
@@ -305,7 +305,7 @@ void tst_QHttpNetworkConnection::put_data()
 
     QTest::newRow("success-internal") << "http://" << QtNetworkSettings::serverName() << "/dav/file1.txt" << ushort(80) << false << "Hello World\nEnd of file\n"<<true;
     QTest::newRow("fail-internal") << "http://" << QtNetworkSettings::serverName() << "/dav2/file1.txt" << ushort(80) << false << "Hello World\nEnd of file\n"<<false;
-    QTest::newRow("fail-host") << "http://" << "fluke-nosuchhost.troll.no" << "/dav2/file1.txt" << ushort(80) << false << "Hello World\nEnd of file\n"<<false;
+    QTest::newRow("fail-host") << "http://" << "invalid.test.qt-project.org" << "/dav2/file1.txt" << ushort(80) << false << "Hello World\nEnd of file\n"<<false;
 }
 
 void tst_QHttpNetworkConnection::put()
diff --git a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
index 64f8f788d3..8e6b2a0d5f 100644
--- a/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/qnetworkreply/tst_qnetworkreply.cpp
@@ -1703,7 +1703,7 @@ void tst_QNetworkReply::getErrors_data()
             << int(QNetworkReply::ProtocolUnknownError) << 0 << true;
 
     // file: errors
-    QTest::newRow("file-host") << "file://this-host-doesnt-exist.troll.no/foo.txt"
+    QTest::newRow("file-host") << "file://invalid.test.qt-project.org/foo.txt"
 #if !defined Q_OS_WIN
                                << int(QNetworkReply::ProtocolInvalidOperationError) << 0 << true;
 #else
@@ -1724,7 +1724,7 @@ void tst_QNetworkReply::getErrors_data()
                                           << int(QNetworkReply::ContentAccessDenied) << 0 << true;
 
     // ftp: errors
-    QTest::newRow("ftp-host") << "ftp://this-host-doesnt-exist.troll.no/foo.txt"
+    QTest::newRow("ftp-host") << "ftp://invalid.test.qt-project.org/foo.txt"
                               << int(QNetworkReply::HostNotFoundError) << 0 << true;
     QTest::newRow("ftp-no-path") << "ftp://" + QtNetworkSettings::serverName()
                                  << int(QNetworkReply::ContentOperationNotPermittedError) << 0 << true;
@@ -1738,7 +1738,7 @@ void tst_QNetworkReply::getErrors_data()
                                << int(QNetworkReply::ContentNotFoundError) << 0 << true;
 
     // http: errors
-    QTest::newRow("http-host") << "http://this-host-will-never-exist.troll.no/"
+    QTest::newRow("http-host") << "http://invalid.test.qt-project.org/"
                                << int(QNetworkReply::HostNotFoundError) << 0 << true;
     QTest::newRow("http-exist") << "http://" + QtNetworkSettings::serverName() + "/this-file-doesnt-exist.txt"
                                 << int(QNetworkReply::ContentNotFoundError) << 404 << false;
diff --git a/tests/auto/qtcpserver/tst_qtcpserver.cpp b/tests/auto/qtcpserver/tst_qtcpserver.cpp
index b353d9aa0f..b6462dfe9c 100644
--- a/tests/auto/qtcpserver/tst_qtcpserver.cpp
+++ b/tests/auto/qtcpserver/tst_qtcpserver.cpp
@@ -619,7 +619,7 @@ void tst_QTcpServer::invalidProxy_data()
                                 << int(QAbstractSocket::UnsupportedSocketOperationError);
 
     QTest::newRow("no-such-host") << int(QNetworkProxy::Socks5Proxy)
-                                  << "this-host-will-never-exist.troll.no" << 1080
+                                  << "invalid.test.qt-project.org" << 1080
                                   << int(QAbstractSocket::ProxyNotFoundError);
     QTest::newRow("socks5-on-http") << int(QNetworkProxy::Socks5Proxy) << fluke << 3128
                                     << int(QAbstractSocket::SocketTimeoutError);
-- 
cgit v1.2.3