Browse Source

Speed up unit testing

QGC4.4
Don Gagne 9 years ago
parent
commit
ef7f6002ee
  1. 2
      src/comm/MockLink.cc
  2. 2
      src/qgcunittest/MavlinkLogTest.cc

2
src/comm/MockLink.cc

@ -143,7 +143,6 @@ void MockLink::run(void)
void MockLink::_run1HzTasks(void) void MockLink::_run1HzTasks(void)
{ {
if (_mavlinkStarted && _connected) { if (_mavlinkStarted && _connected) {
_sendHeartBeat();
_sendVibration(); _sendVibration();
if (!qgcApp()->runningUnitTests()) { if (!qgcApp()->runningUnitTests()) {
// Sending RC Channels during unit test breaks RC tests which does it's own RC simulation // Sending RC Channels during unit test breaks RC tests which does it's own RC simulation
@ -165,6 +164,7 @@ void MockLink::_run1HzTasks(void)
void MockLink::_run10HzTasks(void) void MockLink::_run10HzTasks(void)
{ {
if (_mavlinkStarted && _connected) { if (_mavlinkStarted && _connected) {
_sendHeartBeat();
if (_sendGPSPositionDelayCount > 0) { if (_sendGPSPositionDelayCount > 0) {
// We delay gps position for better testing // We delay gps position for better testing
_sendGPSPositionDelayCount--; _sendGPSPositionDelayCount--;

2
src/qgcunittest/MavlinkLogTest.cc

@ -128,7 +128,7 @@ void MavlinkLogTest::_connectLogWorker(bool arm)
if (arm) { if (arm) {
qgcApp()->toolbox()->multiVehicleManager()->activeVehicle()->setArmed(true); qgcApp()->toolbox()->multiVehicleManager()->activeVehicle()->setArmed(true);
QTest::qWait(1500); // Wait long enough for heartbeat to come through QTest::qWait(500); // Wait long enough for heartbeat to come through
// On Disconnect: We should get a getSaveFileName dialog. // On Disconnect: We should get a getSaveFileName dialog.
logSaveDir.setPath(QStandardPaths::writableLocation(QStandardPaths::TempLocation)); logSaveDir.setPath(QStandardPaths::writableLocation(QStandardPaths::TempLocation));

Loading…
Cancel
Save