summaryrefslogtreecommitdiffstats
path: root/tests/auto/qhttp
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2012-10-22 12:49:45 +0300
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-30 09:39:36 +0100
commit6c00d99161fba59e6fa242d8fdba583b789ee5b2 (patch)
treed2e5018034d177a263f444caad6b54ccbe5dc247 /tests/auto/qhttp
parent72d83cf941b91792a318ab412e3a123edf6addda (diff)
Fix tst_qhttp autotest after Digia acquisition of Qt business.
The autotest expected that qt.nokia.com would respond with "200 OK", but it currently responds with "301 Moved Permanently". Changed test case to use qt-test-server instead of qt.nokia.com. Because qt-test-server does not have developer subpage, changed PCT test case to use simple.html instead. Change-Id: I13430a1d79568a46085f53de49b50989a4fdc144 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/qhttp')
-rw-r--r--tests/auto/qhttp/tst_qhttp.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp
index 14c8c9cba0..f3e71c5dc8 100644
--- a/tests/auto/qhttp/tst_qhttp.cpp
+++ b/tests/auto/qhttp/tst_qhttp.cpp
@@ -789,13 +789,13 @@ void tst_QHttp::proxy_data()
QTest::addColumn<QString>("proxypass");
QTest::newRow("qt-test-server") << QtNetworkSettings::serverName() << 3128
- << QString::fromLatin1("qt.nokia.com") << QString::fromLatin1("/")
+ << QtNetworkSettings::serverName() << QString::fromLatin1("/")
<< QString::fromLatin1("") << QString::fromLatin1("");
QTest::newRow("qt-test-server pct") << QtNetworkSettings::serverName() << 3128
- << QString::fromLatin1("qt.nokia.com") << QString::fromLatin1("/%64eveloper")
+ << QtNetworkSettings::serverName() << QString::fromLatin1("/%73imple.html")
<< QString::fromLatin1("") << QString::fromLatin1("");
QTest::newRow("qt-test-server-basic") << QtNetworkSettings::serverName() << 3129
- << QString::fromLatin1("qt.nokia.com") << QString::fromLatin1("/")
+ << QtNetworkSettings::serverName() << QString::fromLatin1("/")
<< QString::fromLatin1("qsockstest") << QString::fromLatin1("password");
#if 0
@@ -803,7 +803,7 @@ void tst_QHttp::proxy_data()
// the tst_QHttp class is too strict to handle the byte counts sent by dataSendProgress
// So don't run this test:
QTest::newRow("qt-test-server-ntlm") << QtNetworkSettings::serverName() << 3130
- << QString::fromLatin1("qt.nokia.com") << QString::fromLatin1("/")
+ << QtNetworkSettings::serverName() << QString::fromLatin1("/")
<< QString::fromLatin1("qsockstest") << QString::fromLatin1("password");
#endif
}