diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2019-08-13 14:06:29 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2019-08-26 14:09:20 +0000 |
| commit | 47c6aa50d0423b6ccc40abdc16556d60d4fa9342 (patch) | |
| tree | 5453b61268d3ee7b979f738defc00645882c559d | |
| parent | 2bcda9d9f45858ac196d9972162c870ac0a6f217 (diff) | |
Change address URL for local tests in tst_integration
QUrl with address => 31 characters were failing because the socket
connection was disconnecting while being used and causing a segfault.
This re-enable tests affected to increase coverage, however, Another
ticket for the root cause of this bug will be issued.
Fixes: QTBUG-61552
Task-number: QTBUG-77462
Change-Id: I0fdba6a018e7cea85cef9de154ad80565f6d0601
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
| -rw-r--r-- | tests/auto/integration/integration.pro | 3 | ||||
| -rw-r--r-- | tests/auto/integration/tst_integration.cpp | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/tests/auto/integration/integration.pro b/tests/auto/integration/integration.pro index 6428a97..f304014 100644 --- a/tests/auto/integration/integration.pro +++ b/tests/auto/integration/integration.pro @@ -1,8 +1,5 @@ TARGET = tst_integration -# QTBUG-61552 -boot2qt: DEFINES += SKIP_LOCAL - OTHER_FILES = engine.rep \ ../repfiles/localdatacenter.rep \ ../repfiles/tcpdatacenter.rep diff --git a/tests/auto/integration/tst_integration.cpp b/tests/auto/integration/tst_integration.cpp index 7f39381..0718219 100644 --- a/tests/auto/integration/tst_integration.cpp +++ b/tests/auto/integration/tst_integration.cpp @@ -214,9 +214,7 @@ private slots: #ifdef __QNXNTO__ QTest::newRow("qnx") << QUrl(QLatin1String("qnx:replica")) << QUrl(QLatin1String("qnx:registry")); #endif -#ifndef SKIP_LOCAL - QTest::newRow("local") << QUrl(QLatin1String("local:replica_local_integration")) << QUrl(QLatin1String("local:registry_local_integration")); -#endif + QTest::newRow("local") << QUrl(QLatin1String("local:replicaLocalIntegration")) << QUrl(QLatin1String("local:registryLocalIntegration")); QTest::newRow("external") << QUrl() << QUrl(); } @@ -1299,7 +1297,7 @@ private slots: QVERIFY(invalidRegistry.lastError() == QRemoteObjectNode::RegistryNotAcquired); } -#if defined(Q_OS_LINUX) || defined(Q_OS_DARWIN) && !defined(SKIP_LOCAL) +#if defined(Q_OS_LINUX) || defined(Q_OS_DARWIN) void localServerConnectionTest() { QFETCH_GLOBAL(QUrl, hostUrl); |