From 853a46d788a31e26d7b75feed19ad9c0aa4abbe0 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 6 Jul 2014 22:20:51 +0200 Subject: [PATCH] randomize Mock Auto device port to avoid collisions when multiple guh's are running --- plugins/deviceplugins/mock/devicepluginmock.cpp | 4 +++- tests/auto/devices/testdevices.cpp | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/plugins/deviceplugins/mock/devicepluginmock.cpp b/plugins/deviceplugins/mock/devicepluginmock.cpp index 8d4484db..118a0979 100644 --- a/plugins/deviceplugins/mock/devicepluginmock.cpp +++ b/plugins/deviceplugins/mock/devicepluginmock.cpp @@ -268,7 +268,9 @@ void DevicePluginMock::startMonitoringAutoDevices() DeviceDescriptor mockDescriptor(mockDeviceAutoClassId, "Mock Device (Auto created)"); ParamList params; - Param param("httpport", 4242); + qsrand(QDateTime::currentMSecsSinceEpoch()); + int port = 4242 + (qrand() % 1000); + Param param("httpport", port); params.append(param); mockDescriptor.setParams(params); diff --git a/tests/auto/devices/testdevices.cpp b/tests/auto/devices/testdevices.cpp index ac625d6c..dcce09a5 100644 --- a/tests/auto/devices/testdevices.cpp +++ b/tests/auto/devices/testdevices.cpp @@ -241,7 +241,6 @@ void TestDevices::getConfiguredDevices() QVariant response = injectAndWait("Devices.GetConfiguredDevices"); QVariantList devices = response.toMap().value("params").toMap().value("devices").toList(); - qDebug() << "got devices" << devices; QCOMPARE(devices.count(), 2); // There should be one auto created mock device and the one created in initTestcase() }