testutils: Check first for failure
This commit is contained in:
parent
8dde95fc82
commit
545465b52a
|
@ -336,12 +336,12 @@ bool waitForSignalsOrFail(Action action, int timeout, const SignalInfo &failure,
|
||||||
action();
|
action();
|
||||||
|
|
||||||
// no reason to enter event loop when all signals have been emitted directly
|
// no reason to enter event loop when all signals have been emitted directly
|
||||||
if (checkWhetherAllSignalsEmitted(signalInfos...)) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
if (checkWhetherAllSignalsEmitted(failure)) {
|
if (checkWhetherAllSignalsEmitted(failure)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (checkWhetherAllSignalsEmitted(signalInfos...)) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
// also connect and start a timer if a timeout has been specified
|
// also connect and start a timer if a timeout has been specified
|
||||||
QTimer timer;
|
QTimer timer;
|
||||||
|
|
Loading…
Reference in New Issue