hero123457/qtmqtt
1
0
Fork 0
mirror of https://github.com/qt/qtmqtt.git synced 2026-10-25 16:16:26 +00:00
Code Issues Projects Releases Wiki Activity

Fix launching broker on testmachine

Browse Source 
PYTHON3_PATH only returns the directory containing python.
If the environment variable is not set, assume python3 to be in the
path.

Circumvent potential issues when launching the broker, but broker not
being ready to handle connections.

Change-Id: I594e21286bae8b4646fa079c9294d34102c57e66
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Maurice Kalinowski 2017-09-15 10:38:41 +02:00 committed by Simon Hausmann
parent 3840db5254
commit 776cb76226
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
tests/common/broker_connection.h
View File

@ -39,24 +39,43 @@ QString invokeOrInitializeBroker(QProcess *gBrokerProcess)
// Start the paho test broker
QString python = QFile::decodeName(qgetenv("PYTHON3_PATH"));
if (python.isEmpty()) {
const QString usrPython = QFile::decodeName("/usr/bin/python3");
if (QFile::exists(usrPython))
python = usrPython;
else // We assume it to be in the path
python = QLatin1String("python3");
if (!python.isEmpty()) {
#ifdef Q_OS_WIN
python += QLatin1String("/python.exe");
#else
python += QLatin1String("/python3");
#endif
if (!QFileInfo::exists(python)) {
qWarning() << "Could not find Python at:" << python << ". Assuming it in PATH.";
python.clear();
}
}
if (python.isEmpty()) {
#ifdef Q_OS_WIN
python = QLatin1String("python.exe");
#else
python = QLatin1String("python3");
#endif
}
const QStringList arguments = QStringList() << brokerLocation;
qDebug() << "Launching broker:" << python << arguments;
gBrokerProcess->start(python, arguments);
if (!gBrokerProcess->waitForStarted())
qFatal("Could not start MQTT test broker.");
// Give the server some time to initialize, not only launch
QTcpSocket socket;
socket.connectToHost(QLatin1String("localhost"), 1883);
const int maxTries = 6;
// Give the server some time to initialize, not only launch.
// Cannot use QTRY_*
for (int tryCounter = 0; tryCounter < maxTries; ++tryCounter) {
QTcpSocket socket;
socket.connectToHost(QLatin1String("localhost"), 1883);
if (socket.waitForConnected(5000))
return QLatin1String("localhost");
if (socket.waitForConnected(5000))
return QLatin1String("localhost");
QTest::qWait(5000);
}
qWarning("Could not launch MQTT test broker.");
return QString();