diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 04:14:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-18 04:14:37 (GMT) |
| commit | 0d40dbfe167c1e74871002f964f68fac0ccbdd8c (patch) | |
| tree | 0ac2f4205ed54d48cf63553695a07108580eb4db | |
| parent | 7296a5419cf1e0d616aa193829196ec42db55db4 (diff) | |
| parent | d5b5a1ef99dbe20ee9cb3833fb5095c2071c8b12 (diff) | |
| download | Qt-0d40dbfe167c1e74871002f964f68fac0ccbdd8c.zip Qt-0d40dbfe167c1e74871002f964f68fac0ccbdd8c.tar.gz Qt-0d40dbfe167c1e74871002f964f68fac0ccbdd8c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
tst_qhttp: replace legacy qt-test-server hostname in testdata.
| -rw-r--r-- | tests/auto/qhttp/tst_qhttp.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qhttp/tst_qhttp.cpp b/tests/auto/qhttp/tst_qhttp.cpp index f706228..61123c2 100644 --- a/tests/auto/qhttp/tst_qhttp.cpp +++ b/tests/auto/qhttp/tst_qhttp.cpp @@ -856,7 +856,7 @@ void tst_QHttp::proxy2() QTestEventLoop::instance().enterLoop(30); QVERIFY(!QTestEventLoop::instance().timeout()); - QCOMPARE(readyRead_ba.count("Welcome to fluke.troll.no"), 2); + QCOMPARE(readyRead_ba.count("Welcome to qt-test-server"), 2); readyRead_ba.clear(); } @@ -891,7 +891,7 @@ void tst_QHttp::proxy3() QTestEventLoop::instance().enterLoop(30); QVERIFY(!QTestEventLoop::instance().timeout()); - QCOMPARE(readyRead_ba.count("Welcome to fluke.troll.no"), 2); + QCOMPARE(readyRead_ba.count("Welcome to qt-test-server"), 2); readyRead_ba.clear(); } |