diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-12 23:59:46 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-12 23:59:46 +0200 |
| commit | f129de853154dc1d72cb5651606ca009c3b1f814 (patch) | |
| tree | 8d500bcf8e6ef1f6a5f4ea0bc63f1810e6b167ff /tests/auto/qhostinfo/tst_qhostinfo.cpp | |
| parent | 1aa4cfab2d437210b8c0b064fa3bd071e53374c1 (diff) | |
| parent | 0293aff5c44202e5c62e229b74d8bd0bf9206185 (diff) | |
| download | qt4-tools-f129de853154dc1d72cb5651606ca009c3b1f814.tar.gz | |
Merge branch '4.5' into 4.6
Conflicts:
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
Diffstat (limited to 'tests/auto/qhostinfo/tst_qhostinfo.cpp')
| -rw-r--r-- | tests/auto/qhostinfo/tst_qhostinfo.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp index ac6adf7da4..4d63e10bc9 100644 --- a/tests/auto/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp @@ -247,6 +247,9 @@ void tst_QHostInfo::lookupIPv4() QVERIFY(!QTestEventLoop::instance().timeout()); QVERIFY(lookupDone); + if ((int)lookupResults.error() != (int)err) { + qWarning() << hostname << "=>" << lookupResults.errorString(); + } QCOMPARE((int)lookupResults.error(), (int)err); QStringList tmp; @@ -362,6 +365,9 @@ void tst_QHostInfo::blockingLookup() tmp.append(hostInfo.addresses().at(i).toString()); tmp.sort(); + if ((int)hostInfo.error() != (int)err) { + qWarning() << hostname << "=>" << lookupResults.errorString(); + } QCOMPARE((int)hostInfo.error(), (int)err); QStringList expected = addresses.split(' '); |