summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2022-07-14 17:23:44 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-07-14 17:22:41 +0000
commit12772ccefda9189a640afcc6847111dbc0ad7228 (patch)
treedfeb3c8a8aa7411d491240ff64e700636f41a482
parente505e35caf6ecb0c562285f0b6fb1345d144c5e8 (diff)
Android: use different port than 5555 for tst_modelreplicatest
because that port is used by adbd on Android 12, where as adbd is using 5037 on Android 6 which is currently the CI default. Now, trying to add Android 12 to CI this test fails. Change-Id: I860f4dc4fca0c8df525069209a80b6b5ce4e15ae Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Brett Stottlemyer <bstottle@ford.com> (cherry picked from commit 41cf29b2d1ffda38ac1477fd355fe14c4cc13f50) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--tests/auto/modelreplica/tst_modelreplicatest.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/modelreplica/tst_modelreplicatest.cpp b/tests/auto/modelreplica/tst_modelreplicatest.cpp
index 038b339..8cbcbb1 100644
--- a/tests/auto/modelreplica/tst_modelreplicatest.cpp
+++ b/tests/auto/modelreplica/tst_modelreplicatest.cpp
@@ -58,7 +58,7 @@ void ModelreplicaTest::basicFunctions()
{
QFETCH(bool, templated);
- QRemoteObjectRegistryHost host(QUrl("tcp://localhost:5555"));
+ QRemoteObjectRegistryHost host(QUrl("tcp://localhost:5550"));
auto model = new QStringListModel();
model->setStringList(QStringList() << "Track1" << "Track2" << "Track3");
MediaSimpleSource source;
@@ -74,7 +74,7 @@ void ModelreplicaTest::basicFunctions()
source2.setTracks(model2);
host.enableRemoting(&source2);
- QRemoteObjectNode client(QUrl("tcp://localhost:5555"));
+ QRemoteObjectNode client(QUrl("tcp://localhost:5550"));
const QScopedPointer<MediaReplica> replica(client.acquire<MediaReplica>());
QSignalSpy tracksSpy(replica->tracks(), &QAbstractItemModelReplica::initialized);
QVERIFY(replica->waitForSource(300));
@@ -108,11 +108,11 @@ void ModelreplicaTest::basicFunctions()
void ModelreplicaTest::nullModel()
{
- QRemoteObjectRegistryHost host(QUrl("tcp://localhost:5555"));
+ QRemoteObjectRegistryHost host(QUrl("tcp://localhost:5550"));
MediaSimpleSource source;
host.enableRemoting(&source);
- QRemoteObjectNode client(QUrl("tcp://localhost:5555"));
+ QRemoteObjectNode client(QUrl("tcp://localhost:5550"));
const QScopedPointer<MediaReplica> replica(client.acquire<MediaReplica>());
QVERIFY(replica->waitForSource(300));
@@ -135,7 +135,7 @@ void ModelreplicaTest::nestedSortFilterProxyModel()
{
QFETCH(bool, templated);
- QRemoteObjectRegistryHost host(QUrl("tcp://localhost:5555"));
+ QRemoteObjectRegistryHost host(QUrl("tcp://localhost:5550"));
auto model = new QStringListModel(this);
model->setStringList(QStringList() << "CCC" << "AAA" << "BBB");
auto proxyModel = new QSortFilterProxyModel(this);
@@ -148,7 +148,7 @@ void ModelreplicaTest::nestedSortFilterProxyModel()
else
host.enableRemoting(&source);
- QRemoteObjectNode client(QUrl("tcp://localhost:5555"));
+ QRemoteObjectNode client(QUrl("tcp://localhost:5550"));
const QScopedPointer<MediaReplica> replica(client.acquire<MediaReplica>());
QSignalSpy tracksSpy(replica->tracks(), &QAbstractItemModelReplica::initialized);
QVERIFY(replica->waitForSource(300));
@@ -185,7 +185,7 @@ void ModelreplicaTest::sortFilterProxyModel()
{
QFETCH(bool, prefetch);
- QRemoteObjectRegistryHost host(QUrl("tcp://localhost:5555"));
+ QRemoteObjectRegistryHost host(QUrl("tcp://localhost:5550"));
auto model = new QStringListModel(this);
model->setStringList(QStringList() << "CCC" << "AAA" << "BBB");
auto proxyModel = new QSortFilterProxyModel(this);
@@ -195,7 +195,7 @@ void ModelreplicaTest::sortFilterProxyModel()
host.enableRemoting(proxyModel, "test", roles);
auto fetchMode = prefetch ? QtRemoteObjects::PrefetchData : QtRemoteObjects::FetchRootSize;
- QRemoteObjectNode client(QUrl("tcp://localhost:5555"));
+ QRemoteObjectNode client(QUrl("tcp://localhost:5550"));
QScopedPointer<QAbstractItemModelReplica> replica(client.acquireModel("test", fetchMode));
QSignalSpy initSpy(replica.get(), &QAbstractItemModelReplica::initialized);
QVERIFY(initSpy.wait());