From 501c4c2a5c54adc688bf330fc36872cf3820db33 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 7 Sep 2019 19:29:56 -0700 Subject: [PATCH] Don't create source if unit tests --- src/PositionManager/PositionManager.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/PositionManager/PositionManager.cpp b/src/PositionManager/PositionManager.cpp index 9379be6..4ed76fd 100644 --- a/src/PositionManager/PositionManager.cpp +++ b/src/PositionManager/PositionManager.cpp @@ -34,7 +34,13 @@ void QGCPositionManager::setToolbox(QGCToolbox *toolbox) QGCTool::setToolbox(toolbox); //-- First see if plugin provides a position source _defaultSource = toolbox->corePlugin()->createPositionSource(this); - if(!_defaultSource) { + + if (qgcApp()->runningUnitTests()) { + // Units test on travis fail due to lack of position source + return; + } + + if (!_defaultSource) { //-- Otherwise, create a default one _defaultSource = QGeoPositionInfoSource::createDefaultSource(this); } @@ -136,11 +142,5 @@ void QGCPositionManager::setPositionSource(QGCPositionManager::QGCPositionSource void QGCPositionManager::_error(QGeoPositionInfoSource::Error positioningError) { - QGeoPositionInfoSource* source = qobject_cast(sender()); - if (source && qgcApp()->runningUnitTests() && source->sourceName() == "serialnmea") { - // We don't want unit tests run in the cloud which has no WiFi to pop a qWarning - qDebug() << "QGCPositionManager error" << positioningError; - } else { - qWarning() << "QGCPositionManager error" << positioningError; - } + qWarning() << "QGCPositionManager error" << positioningError; }