From 4d00ecb9778d05525416ed0ea0a5be9a8944ae88 Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Tue, 5 Jun 2018 13:36:09 +0300
Subject: Fix recursive error when there are unstable components

Change-Id: Iecaf849368904a72bae1a1ca6e51b45cfafb54ef
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
---
 tests/auto/installer/solver/tst_solver.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/installer/solver/tst_solver.cpp b/tests/auto/installer/solver/tst_solver.cpp
index 7ae502a5e..d1c3aaa14 100644
--- a/tests/auto/installer/solver/tst_solver.cpp
+++ b/tests/auto/installer/solver/tst_solver.cpp
@@ -32,6 +32,7 @@
 #include <uninstallercalculator.h>
 #include <componentchecker.h>
 #include <packagemanagercore.h>
+#include <settings.h>
 
 #include <QTest>
 
@@ -208,9 +209,16 @@ private slots:
         core->appendRootComponent(componentA);
         core->appendRootComponent(componentB);
 
-        QTest::newRow("Installer resolved") << core
-                    << (QList<Component *>() << componentA)
-                    << (QList<Component *>());
+        if (core->settings().allowUnstableComponents()) {
+            QTest::newRow("Installer resolved") << core
+                        << (QList<Component *>() << componentA)
+                        << (QList<Component *>() << componentA);
+        } else {
+            QTest::newRow("Installer resolved") << core
+                        << (QList<Component *>() << componentA)
+                        << (QList<Component *>());
+        }
+
     }
 
     void unresolvedDependencyVersion()
-- 
cgit v1.2.3