diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-12 21:59:46 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-09-12 21:59:46 (GMT) |
| commit | f129de853154dc1d72cb5651606ca009c3b1f814 (patch) | |
| tree | 8d500bcf8e6ef1f6a5f4ea0bc63f1810e6b167ff /tests/auto | |
| parent | 1aa4cfab2d437210b8c0b064fa3bd071e53374c1 (diff) | |
| parent | 0293aff5c44202e5c62e229b74d8bd0bf9206185 (diff) | |
| download | Qt-f129de853154dc1d72cb5651606ca009c3b1f814.zip Qt-f129de853154dc1d72cb5651606ca009c3b1f814.tar.gz Qt-f129de853154dc1d72cb5651606ca009c3b1f814.tar.bz2 | |
Merge branch '4.5' into 4.6
Conflicts:
tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro
tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
Diffstat (limited to 'tests/auto')
4 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp index ac6adf7..4d63e10 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(' '); diff --git a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro index 5ce3a2d..0021bc1 100644 --- a/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro +++ b/tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro @@ -1,7 +1,6 @@ load(qttest_p4) SOURCES += tst_qhttpnetworkconnection.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib - requires(contains(QT_CONFIG,private_tests)) QT = core network diff --git a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro index f86250a..1782b43 100644 --- a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro +++ b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro @@ -1,7 +1,6 @@ load(qttest_p4) SOURCES += tst_qhttpnetworkreply.cpp INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/zlib - requires(contains(QT_CONFIG,private_tests)) QT = core network diff --git a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp index b16b3cc..9cd9f39 100644 --- a/tests/auto/qsslcertificate/tst_qsslcertificate.cpp +++ b/tests/auto/qsslcertificate/tst_qsslcertificate.cpp @@ -771,7 +771,7 @@ void tst_QSslCertificate::nulInSan() QVERIFY(!dnssan.isEmpty()); QVERIFY(dnssan != "www.bank.com"); - static const char realSAN[] = "www.bank.com\0.badguy.com"; + static const char realSAN[] = "www.bank.com\0www.badguy.com"; QCOMPARE(dnssan, QString::fromLatin1(realSAN, sizeof realSAN - 1)); } |