From 8916626ded52c9c6837d901bbc5edd274247ce7f Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Sun, 4 May 2014 13:41:38 +0200 Subject: [PATCH] fix tests again :) --- plugins/deviceplugins/mock/devicepluginmock.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/deviceplugins/mock/devicepluginmock.cpp b/plugins/deviceplugins/mock/devicepluginmock.cpp index 6ab08034..48c86ee4 100644 --- a/plugins/deviceplugins/mock/devicepluginmock.cpp +++ b/plugins/deviceplugins/mock/devicepluginmock.cpp @@ -256,6 +256,11 @@ bool DevicePluginMock::configureAutoDevice(QList loadedDevices, Device QPair DevicePluginMock::executeAction(Device *device, const Action &action) { + if (!myDevices().contains(device)) { + qWarning() << "Should execute action for a device which doesn't seem to be mine."; + return report(DeviceManager::DeviceErrorDeviceNotFound, "Should execute an action for a device which doesn't seem to be mine."); + } + qDebug() << "Should execute action" << action.actionTypeId(); m_daemons.value(device)->actionExecuted(action.actionTypeId()); return report(); @@ -312,11 +317,6 @@ void DevicePluginMock::emitDeviceSetupFinished() { qDebug() << "emitting setup finised"; Device *device = m_asyncSetupDevices.takeFirst(); - if (!myDevices().contains(device)) { - qWarning() << "Should emit deviceSetupFinished but device seems to have gone."; - return; - } - if (device->deviceClassId() == mockDeviceAsyncSetupClassId) { emit deviceSetupFinished(device, DeviceManager::DeviceSetupStatusSuccess, QString()); } else {