summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Keller <Rainer.Keller@qt.io>2019-04-08 11:03:41 +0200
committerRainer Keller <Rainer.Keller@qt.io>2019-04-10 12:00:30 +0000
commitc85a87c5f9d062d4abc837edc61129fc7f8d9cee (patch)
treec36c1e203854a30b3501006efda7eb4b2ba81edb
parentc01f40838332add667dbc106768fdb435e767fb2 (diff)
tests: Check if server is up and runningv5.13.0-beta2
Change-Id: Ie2d2ac5e4a84f85ce7d43d5a8e0454b26e58a7a8 Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
-rw-r--r--tests/auto/qopcuaclient/tst_client.cpp18
1 files changed, 16 insertions, 2 deletions
diff --git a/tests/auto/qopcuaclient/tst_client.cpp b/tests/auto/qopcuaclient/tst_client.cpp
index a320dba..7efc94a 100644
--- a/tests/auto/qopcuaclient/tst_client.cpp
+++ b/tests/auto/qopcuaclient/tst_client.cpp
@@ -595,8 +595,22 @@ void Tst_QOpcUaClient::initTestCase()
m_serverProcess.start(m_testServerPath);
QVERIFY2(m_serverProcess.waitForStarted(), qPrintable(m_serverProcess.errorString()));
- // Let the server come up
- QTest::qSleep(2000);
+
+ // Check if server is up and running
+ QVERIFY(m_serverProcess.state() == QProcess::Running);
+
+ QTest::qSleep(100);
+ socket.connectToHost(defaultHost, defaultPort);
+ if (!socket.waitForConnected(5000))
+ {
+ //Try a second time
+ QTest::qSleep(5000);
+ socket.connectToHost(defaultHost, defaultPort);
+ if (!socket.waitForConnected(5000))
+ QFAIL("Server does not run");
+ }
+
+ socket.disconnectFromHost();
}
QString host = envOrDefault("OPCUA_HOST", defaultHost.toString());
QString port = envOrDefault("OPCUA_PORT", QString::number(defaultPort));