D25458: Attempt to make tests on CI more robust

David Faure noreply at phabricator.kde.org
Fri Nov 22 11:10:00 GMT 2019


dfaure added inline comments.

INLINE COMMENTS

> setup.cpp:98
> +        qCritical() << "Failed to create agent:" << job->errorString();
>          setupFailed();
>          return;

here you call only setupFailed....

> setup.cpp:123
>          qCritical() << job->errorString();
>          setupFailed();
>      }

... while here you call `setupFailed` followed by `checkSetupDone`.

How about always calling both (on error) so that you can remove the if+shutdown in setupFailed?
And then `setupFailed` can go away and you can just do `mExitCode = 1;` in both places where you call `setupFailed` currently.

IOW this means turning lines 99-100 into `} else {` so that `checkSetupDone()` is called in all cases.

> agentmanager.cpp:620
>  
> -    //qCDebug(AKONADICONTROL_LOG) << "Service " << name << " owner changed from " << oldOwner << " to " << newOwner;
> +    qCDebug(AKONADICONTROL_LOG) << "Service " << name << " owner changed from " << oldOwner << " to " << newOwner;
>  

(too many spaces in the string constants here)

> agentmanager.cpp:671
> +        const AgentInstance::Ptr instance = mAgentInstances.value(service->serviceName);
> +        const bool restarting = instance->hasResourceInterface();
> +        if (!instance->obtainResourceInterface()) {

I admit I don't fully understand the logic here.

REPOSITORY
  R165 Akonadi

REVISION DETAIL
  https://phabricator.kde.org/D25458

To: dvratil, dfaure
Cc: kde-pim, fbampaloukas, dcaliste, dvasin, rodsevich, winterz, vkrause, mlaurent, knauss, dvratil
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/kde-pim/attachments/20191122/6e6760e7/attachment.html>


More information about the kde-pim mailing list