From d2f1f2766cc97fab99a8b6af634dfd1b94b71f21 Mon Sep 17 00:00:00 2001
From: Don Gagne <dongagne@outlook.com>
Date: Sat, 7 Sep 2019 18:53:54 -0700
Subject: [PATCH] Don't pop qWarning during unit tests
---
src/PositionManager/PositionManager.cpp | 8 +++++++-
src/QtLocationPlugin/QGCTileCacheWorker.cpp | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/PositionManager/PositionManager.cpp b/src/PositionManager/PositionManager.cpp
index 99620d2050..9379be6c26 100644
--- a/src/PositionManager/PositionManager.cpp
+++ b/src/PositionManager/PositionManager.cpp
@@ -136,5 +136,11 @@ void QGCPositionManager::setPositionSource(QGCPositionManager::QGCPositionSource
void QGCPositionManager::_error(QGeoPositionInfoSource::Error positioningError)
{
- qWarning() << "QGCPositionManager error" << positioningError;
+ QGeoPositionInfoSource* source = qobject_cast<QGeoPositionInfoSource*>(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;
+ }
}
diff --git a/src/QtLocationPlugin/QGCTileCacheWorker.cpp b/src/QtLocationPlugin/QGCTileCacheWorker.cpp
index 307ce051b8..1a4ce7fa6d 100644
--- a/src/QtLocationPlugin/QGCTileCacheWorker.cpp
+++ b/src/QtLocationPlugin/QGCTileCacheWorker.cpp
@@ -1136,7 +1136,7 @@ QGCCacheWorker::_lookupReady(QHostInfo info)
return;
}
}
- qWarning() << "No Internet Access";
+ qDebug() << "No Internet Access";
emit internetStatus(false);
#endif
}
--
GitLab