1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QHostInfo: don't use the test class to store results

Browse Source 
Because QHostInfo is threaded, so if the look up times out and we exit a
given test, the results may still be delivered to the next test.
Especially if the next test is also about to time out -- in which case
it doesn't and prints a nonsensical output.

Before:

FAIL!  : tst_QHostInfo::lookupIPv4(WithCache:literal_ip4) '!QTestEventLoop::instance().timeout()' returned FALSE. ()
   Loc: [tst_qhostinfo.cpp(220)]
FAIL!  : tst_QHostInfo::lookupIPv6(WithCache:aaaa-single) Compared values are not the same
   Actual   (tmp.join(' ').toLower())     : "192.0.2.1"
   Expected (expected.join(' ').toLower()): "2001:db8::1"
   Loc: [tst_qhostinfo.cpp(281)]

Now:

FAIL!  : tst_QHostInfo::lookupIPv4(WithCache:literal_ip4) 'helper.waitForResults()' returned FALSE. ()
   Loc: [tst_qhostinfo.cpp(278)]
PASS   : tst_QHostInfo::lookupIPv6(WithCache:aaaa-single)

Change-Id: I6818d78a57394e37857bfffd17bc66e241cab24d
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 78cf5740a95d2dbf985cc137240a11f0c4ebfde0)
This commit is contained in:
Thiago Macieira 2024-03-13 11:38:00 -07:00
parent b75704a519
commit 15c96b4172
1 changed files with 93 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

215
tests/auto/network/kernel/qhostinfo/tst_qhostinfo.cpp
View File

@ -46,6 +46,8 @@
#define TEST_DOMAIN ".test.qt-project.org" #define TEST_DOMAIN ".test.qt-project.org"
using namespace std::chrono_literals;
class tst_QHostInfo : public QObject class tst_QHostInfo : public QObject
{ {
Q_OBJECT Q_OBJECT
@ -83,15 +85,55 @@ private slots:
void cache(); void cache();
void abortHostLookup(); void abortHostLookup();
protected slots:
void resultsReady(const QHostInfo &);
private: private:
bool ipv6LookupsAvailable; bool ipv6LookupsAvailable;
bool ipv6Available; bool ipv6Available;
bool lookupDone; };
int lookupsDoneCounter;
class tst_QHostInfo_Helper : public QObject
{
Q_OBJECT
protected slots:
void resultsReady(const QHostInfo &);
public:
tst_QHostInfo_Helper(const QString &hostname)
: hostname(hostname)
{}
QString hostname;
bool lookupDone = false;
int lookupsDoneCounter = 0;
QHostInfo lookupResults; QHostInfo lookupResults;
void blockingLookup()
{
lookupResults = QHostInfo::fromName(hostname);
lookupDone = true;
++lookupsDoneCounter;
}
void lookupHostOldStyle()
{
QHostInfo::lookupHost(hostname, this, SLOT(resultsReady(QHostInfo)));
}
void lookupHostNewStyle()
{
QHostInfo::lookupHost(hostname, this, &tst_QHostInfo_Helper::resultsReady);
}
void lookupHostLambda()
{
QHostInfo::lookupHost(hostname, this, [this](const QHostInfo &hostInfo) {
resultsReady(hostInfo);
});
}
bool waitForResults(std::chrono::milliseconds timeout = 10s)
{
QTestEventLoop::instance().enterLoop(timeout);
return !QTestEventLoop::instance().timeout() && lookupDone;
}
void checkResults(QHostInfo::HostInfoError err, const QString &addresses);
}; };
void tst_QHostInfo::swapFunction() void tst_QHostInfo::swapFunction()
@ -207,23 +249,12 @@ void tst_QHostInfo::lookupIPv4_data()
QTest::newRow("idn-unicode") << QString::fromLatin1("a-single.alqualond\353" TEST_DOMAIN) << "192.0.2.1" << int(QHostInfo::NoError); QTest::newRow("idn-unicode") << QString::fromLatin1("a-single.alqualond\353" TEST_DOMAIN) << "192.0.2.1" << int(QHostInfo::NoError);
} }
void tst_QHostInfo::lookupIPv4() void tst_QHostInfo_Helper::checkResults(QHostInfo::HostInfoError err, const QString &addresses)
{ {
QFETCH(QString, hostname);
QFETCH(int, err);
QFETCH(QString, addresses);
lookupDone = false;
QHostInfo::lookupHost(hostname, this, SLOT(resultsReady(QHostInfo)));
QTestEventLoop::instance().enterLoop(10);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(lookupDone);
if ((int)lookupResults.error() != (int)err) { if ((int)lookupResults.error() != (int)err) {
qWarning() << hostname << "=>" << lookupResults.errorString(); qWarning() << hostname << "=>" << lookupResults.errorString();
} }
QCOMPARE((int)lookupResults.error(), (int)err); QCOMPARE(lookupResults.error(), err);
QStringList tmp; QStringList tmp;
for (int i = 0; i < lookupResults.addresses().size(); ++i) for (int i = 0; i < lookupResults.addresses().size(); ++i)
@ -236,6 +267,18 @@ void tst_QHostInfo::lookupIPv4()
QCOMPARE(tmp.join(' '), expected.join(' ')); QCOMPARE(tmp.join(' '), expected.join(' '));
} }
void tst_QHostInfo::lookupIPv4()
{
QFETCH(QString, hostname);
QFETCH(int, err);
QFETCH(QString, addresses);
tst_QHostInfo_Helper helper(hostname);
helper.lookupHostOldStyle();
QVERIFY(helper.waitForResults());
helper.checkResults(QHostInfo::HostInfoError(err), addresses);
}
void tst_QHostInfo::lookupIPv6_data() void tst_QHostInfo::lookupIPv6_data()
{ {
QTest::addColumn<QString>("hostname"); QTest::addColumn<QString>("hostname");
@ -261,24 +304,10 @@ void tst_QHostInfo::lookupIPv6()
if (!ipv6LookupsAvailable) if (!ipv6LookupsAvailable)
QSKIP("This platform does not support IPv6 lookups"); QSKIP("This platform does not support IPv6 lookups");
lookupDone = false; tst_QHostInfo_Helper helper(hostname);
QHostInfo::lookupHost(hostname, this, SLOT(resultsReady(QHostInfo))); helper.lookupHostOldStyle();
QVERIFY(helper.waitForResults());
QTestEventLoop::instance().enterLoop(10); helper.checkResults(QHostInfo::HostInfoError(err), addresses);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(lookupDone);
QCOMPARE((int)lookupResults.error(), (int)err);
QStringList tmp;
for (int i = 0; i < lookupResults.addresses().size(); ++i)
tmp.append(lookupResults.addresses().at(i).toString());
tmp.sort();
QStringList expected = addresses.split(' ');
expected.sort();
QCOMPARE(tmp.join(' ').toLower(), expected.join(' ').toLower());
} }
void tst_QHostInfo::lookupConnectToFunctionPointer_data() void tst_QHostInfo::lookupConnectToFunctionPointer_data()
@ -292,26 +321,10 @@ void tst_QHostInfo::lookupConnectToFunctionPointer()
QFETCH(int, err); QFETCH(int, err);
QFETCH(QString, addresses); QFETCH(QString, addresses);
lookupDone = false; tst_QHostInfo_Helper helper(hostname);
QHostInfo::lookupHost(hostname, this, &tst_QHostInfo::resultsReady); helper.lookupHostNewStyle();
QVERIFY(helper.waitForResults());
QTestEventLoop::instance().enterLoop(10); helper.checkResults(QHostInfo::HostInfoError(err), addresses);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(lookupDone);
if (int(lookupResults.error()) != int(err))
qWarning() << hostname << "=>" << lookupResults.errorString();
QCOMPARE(int(lookupResults.error()), int(err));
QStringList tmp;
for (const auto &result : lookupResults.addresses())
tmp.append(result.toString());
tmp.sort();
QStringList expected = addresses.split(' ');
expected.sort();
QCOMPARE(tmp.join(' '), expected.join(' '));
} }
void tst_QHostInfo::lookupConnectToFunctionPointerDeleted() void tst_QHostInfo::lookupConnectToFunctionPointerDeleted()
@ -336,28 +349,10 @@ void tst_QHostInfo::lookupConnectToLambda()
QFETCH(int, err); QFETCH(int, err);
QFETCH(QString, addresses); QFETCH(QString, addresses);
lookupDone = false; tst_QHostInfo_Helper helper(hostname);
QHostInfo::lookupHost(hostname, [this](const QHostInfo &hostInfo) { helper.lookupHostLambda();
resultsReady(hostInfo); QVERIFY(helper.waitForResults());
}); helper.checkResults(QHostInfo::HostInfoError(err), addresses);
QTestEventLoop::instance().enterLoop(10);
QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(lookupDone);
if (int(lookupResults.error()) != int(err))
qWarning() << hostname << "=>" << lookupResults.errorString();
QCOMPARE(int(lookupResults.error()), int(err));
QStringList tmp;
for (int i = 0; i < lookupResults.addresses().size(); ++i)
tmp.append(lookupResults.addresses().at(i).toString());
tmp.sort();
QStringList expected = addresses.split(' ');
expected.sort();
QCOMPARE(tmp.join(' '), expected.join(' '));
} }
static QStringList reverseLookupHelper(const QString &ip) static QStringList reverseLookupHelper(const QString &ip)
@ -440,21 +435,9 @@ void tst_QHostInfo::blockingLookup()
QFETCH(int, err); QFETCH(int, err);
QFETCH(QString, addresses); QFETCH(QString, addresses);
QHostInfo hostInfo = QHostInfo::fromName(hostname); tst_QHostInfo_Helper helper(hostname);
QStringList tmp; helper.blockingLookup();
for (int i = 0; i < hostInfo.addresses().size(); ++i) helper.checkResults(QHostInfo::HostInfoError(err), addresses);
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(' ');
expected.sort();
QCOMPARE(tmp.join(' ').toUpper(), expected.join(' ').toUpper());
} }
void tst_QHostInfo::raceCondition() void tst_QHostInfo::raceCondition()
@ -544,17 +527,11 @@ void tst_QHostInfo::threadSafetyAsynchronousAPI()
void tst_QHostInfo::multipleSameLookups() void tst_QHostInfo::multipleSameLookups()
{ {
const int COUNT = 10; const int COUNT = 10;
lookupsDoneCounter = 0; tst_QHostInfo_Helper helper("localhost");
for (int i = 0; i < COUNT; i++) for (int i = 0; i < COUNT; i++)
QHostInfo::lookupHost("localhost", this, SLOT(resultsReady(QHostInfo))); helper.lookupHostOldStyle();
QElapsedTimer timer; QTRY_COMPARE_WITH_TIMEOUT(helper.lookupsDoneCounter, COUNT, 10000);
timer.start();
while (timer.elapsed() < 10000 && lookupsDoneCounter < COUNT) {
QTestEventLoop::instance().enterLoop(2);
}
QCOMPARE(lookupsDoneCounter, COUNT);
} }
// this test is for the multi-threaded QHostInfo rewrite. It is about getting results at all, // this test is for the multi-threaded QHostInfo rewrite. It is about getting results at all,
@ -583,19 +560,15 @@ void tst_QHostInfo::multipleDifferentLookups()
QFETCH(int, repeats); QFETCH(int, repeats);
const int COUNT = hostnameList.size(); const int COUNT = hostnameList.size();
lookupsDoneCounter = 0; tst_QHostInfo_Helper helper(QString{});
for (int i = 0; i < hostnameList.size(); i++) for (int i = 0; i < hostnameList.size(); i++)
for (int j = 0; j < repeats; ++j) for (int j = 0; j < repeats; ++j) {
QHostInfo::lookupHost(hostnameList.at(i), this, SLOT(resultsReady(QHostInfo))); helper.hostname = hostnameList.at(i);
helper.lookupHostOldStyle();
}
QElapsedTimer timer; QTRY_COMPARE_WITH_TIMEOUT(helper.lookupsDoneCounter, repeats*COUNT, 60000);
timer.start();
while (timer.elapsed() < 60000 && lookupsDoneCounter < repeats*COUNT) {
QTestEventLoop::instance().enterLoop(2);
//qDebug() << "t:" << timer.elapsed();
}
QCOMPARE(lookupsDoneCounter, repeats*COUNT);
} }
void tst_QHostInfo::cache() void tst_QHostInfo::cache()
@ -604,13 +577,12 @@ void tst_QHostInfo::cache()
if (!cache) if (!cache)
return; // test makes only sense when cache enabled return; // test makes only sense when cache enabled
// reset slot counter tst_QHostInfo_Helper helper("localhost");
lookupsDoneCounter = 0;
// lookup once, wait in event loop, result should not come directly. // lookup once, wait in event loop, result should not come directly.
bool valid = true; bool valid = true;
int id = -1; int id = -1;
QHostInfo result = qt_qhostinfo_lookup("localhost", this, SLOT(resultsReady(QHostInfo)), &valid, &id); QHostInfo result = qt_qhostinfo_lookup(helper.hostname, &helper, SLOT(resultsReady(QHostInfo)), &valid, &id);
QTestEventLoop::instance().enterLoop(5); QTestEventLoop::instance().enterLoop(5);
QVERIFY(!QTestEventLoop::instance().timeout()); QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(!valid); QVERIFY(!valid);
@ -618,7 +590,7 @@ void tst_QHostInfo::cache()
// loopkup second time, result should come directly // loopkup second time, result should come directly
valid = false; valid = false;
result = qt_qhostinfo_lookup("localhost", this, SLOT(resultsReady(QHostInfo)), &valid, &id); result = qt_qhostinfo_lookup(helper.hostname, &helper, SLOT(resultsReady(QHostInfo)), &valid, &id);
QVERIFY(valid); QVERIFY(valid);
QVERIFY(!result.addresses().isEmpty()); QVERIFY(!result.addresses().isEmpty());
@ -627,17 +599,17 @@ void tst_QHostInfo::cache()
// lookup third time, result should not come directly. // lookup third time, result should not come directly.
valid = true; valid = true;
result = qt_qhostinfo_lookup("localhost", this, SLOT(resultsReady(QHostInfo)), &valid, &id); result = qt_qhostinfo_lookup(helper.hostname, &helper, SLOT(resultsReady(QHostInfo)), &valid, &id);
QTestEventLoop::instance().enterLoop(5); QTestEventLoop::instance().enterLoop(5);
QVERIFY(!QTestEventLoop::instance().timeout()); QVERIFY(!QTestEventLoop::instance().timeout());
QVERIFY(!valid); QVERIFY(!valid);
QVERIFY(result.addresses().isEmpty()); QVERIFY(result.addresses().isEmpty());
// the slot should have been called 2 times. // the slot should have been called 2 times.
QCOMPARE(lookupsDoneCounter, 2); QCOMPARE(helper.lookupsDoneCounter, 2);
} }
void tst_QHostInfo::resultsReady(const QHostInfo &hi) void tst_QHostInfo_Helper::resultsReady(const QHostInfo &hi)
{ {
QVERIFY(QThread::currentThread() == thread()); QVERIFY(QThread::currentThread() == thread());
lookupDone = true; lookupDone = true;
@ -648,16 +620,15 @@ void tst_QHostInfo::resultsReady(const QHostInfo &hi)
void tst_QHostInfo::abortHostLookup() void tst_QHostInfo::abortHostLookup()
{ {
//reset counter tst_QHostInfo_Helper helper("a-single" TEST_DOMAIN);
lookupsDoneCounter = 0;
bool valid = false; bool valid = false;
int id = -1; int id = -1;
QHostInfo result = qt_qhostinfo_lookup("a-single" TEST_DOMAIN, this, SLOT(resultsReady(QHostInfo)), &valid, &id); QHostInfo result = qt_qhostinfo_lookup(helper.hostname, &helper, SLOT(resultsReady(QHostInfo)), &valid, &id);
QVERIFY(!valid); QVERIFY(!valid);
//it is assumed that the DNS request/response in the backend is slower than it takes to call abort //it is assumed that the DNS request/response in the backend is slower than it takes to call abort
QHostInfo::abortHostLookup(id); QHostInfo::abortHostLookup(id);
QTestEventLoop::instance().enterLoop(5); QTestEventLoop::instance().enterLoop(5);
QCOMPARE(lookupsDoneCounter, 0); QCOMPARE(helper.lookupsDoneCounter, 0);
} }
class LookupAborter : public QObject class LookupAborter : public QObject