flatpak: Improve flatpaktest reliability

Do not destroy the installations after we've waited for the threads to
finish.

libdiscover/backends/FlatpakBackend/FlatpakBackend.cpp

@@ -304,13 +304,14 @@ FlatpakBackend::FlatpakBackend(QObject *parent)
 FlatpakBackend::~FlatpakBackend()
 {
     g_cancellable_cancel(m_cancellable);
-    for (auto inst : qAsConst(m_installations))
-        g_object_unref(inst);
     if (!m_threadPool.waitForDone(200)) {
         qDebug() << "could not kill them all" << m_threadPool.activeThreadCount();
     }
     m_threadPool.clear();
 
+    for (auto inst : qAsConst(m_installations))
+        g_object_unref(inst);
+    m_installations.clear();
     g_object_unref(m_cancellable);
 }
 
@@ -1421,6 +1422,10 @@ ResultsStream *FlatpakBackend::search(const AbstractResourcesBackend::Filters &f
             auto cancellable = m_cancellable;
             fw->setFuture(QtConcurrent::run(&m_threadPool, [installations, cancellable] {
                 QHash<FlatpakInstallation *, QVector<FlatpakInstalledRef *>> ret;
+                if (g_cancellable_is_cancelled(cancellable)) {
+                    qWarning() << "Job cancelled";
+                    return ret;
+                }
 
                 for (auto installation : installations) {
                     g_autoptr(GError) localError = nullptr;
@@ -1431,7 +1436,8 @@ ResultsStream *FlatpakBackend::search(const AbstractResourcesBackend::Filters &f
                     }
                     if (g_cancellable_is_cancelled(cancellable)) {
                         qWarning() << "Job cancelled";
-                        return ret;
+                        ret.clear();
+                        break;
                     }
 
                     auto &current = ret[installation];

libdiscover/backends/FlatpakBackend/FlatpakFetchDataJob.cpp

@@ -12,7 +12,7 @@ namespace FlatpakRunnables
 FlatpakRemoteRef *findRemoteRef(FlatpakResource *app, GCancellable *cancellable)
 {
     if (app->origin().isEmpty()) {
-        qWarning() << "Failed to get metadata file because of missing origin";
+        qWarning("Failed to get metadata file because of missing origin");
         return nullptr;
     }
 
@@ -28,9 +28,8 @@ FlatpakRemoteRef *findRemoteRef(FlatpakResource *app, GCancellable *cancellable)
                                                                FLATPAK_QUERY_FLAGS_ONLY_CACHED,
                                                                cancellable,
                                                                &localError);
-    if (!ret) {
-        qWarning() << "Failed to find:" << app->ref() << "in" << origin << localError->message;
-        return {};
+    if (localError) {
+        qWarning("Failed to find ref");
     }
     return ret;
 }
@@ -39,7 +38,10 @@ QByteArray fetchMetadata(FlatpakResource *app, GCancellable *cancellable)
 {
     FlatpakRemoteRef *remoteRef = findRemoteRef(app, cancellable);
     if (!remoteRef) {
-        qDebug() << "failed to find the remote" << app->name();
+        if (!g_cancellable_is_cancelled(cancellable)) {
+            qDebug() << "failed to find the remote" << app->name();
+        }
+
         return {};
     }