summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2011-09-05 10:51:11 +0300
committerTimo Teräs <timo.teras@iki.fi>2011-09-05 11:04:00 +0300
commit0e24207c2e4fedb9c0656ed98bc37cd37df44d91 (patch)
tree81ce5aa5b15d438f768507c90be5d18b07825025 /test
parent1fb1afc5c25830c6914789d7b427c9ffdf88a24e (diff)
downloadapk-tools-0e24207c2e4fedb9c0656ed98bc37cd37df44d91.tar.bz2
apk-tools-0e24207c2e4fedb9c0656ed98bc37cd37df44d91.tar.xz
solver: report 'complete' solutions with errors
Allow to select packages that conflict in case we are looking for errors. This allows 'add --force' to install (on boot) the set of packages with minimum conflicts.
Diffstat (limited to 'test')
-rw-r--r--test/error1.expect3
-rw-r--r--test/error2.expect5
-rw-r--r--test/error3.expect3
-rw-r--r--test/error5.expect3
4 files changed, 4 insertions, 10 deletions
diff --git a/test/error1.expect b/test/error1.expect
index d481e43..6f340f1 100644
--- a/test/error1.expect
+++ b/test/error1.expect
@@ -1,4 +1,3 @@
-3 unsatisfiable dependencies (solution with 3 names)
+2 unsatisfiable dependencies (solution with 4 names)
world: d>1.5
-b-1: d<2.0
c-1: d>1.0
diff --git a/test/error2.expect b/test/error2.expect
index e4e6ffe..5ab9023 100644
--- a/test/error2.expect
+++ b/test/error2.expect
@@ -1,5 +1,2 @@
-4 unsatisfiable dependencies (solution with 3 names)
-world: d<1.5
-a-3: d>1.5
-b-1: d<2.0
+1 unsatisfiable dependencies (solution with 4 names)
c-1: d>1.0
diff --git a/test/error3.expect b/test/error3.expect
index eefc650..55be962 100644
--- a/test/error3.expect
+++ b/test/error3.expect
@@ -1,3 +1,2 @@
-1 unsatisfiable dependencies (solution with 3 names)
+1 unsatisfiable dependencies (solution with 4 names)
world: !b
-a-3: b
diff --git a/test/error5.expect b/test/error5.expect
index e98107c..553ecf3 100644
--- a/test/error5.expect
+++ b/test/error5.expect
@@ -1,4 +1,3 @@
-3 unsatisfiable dependencies (solution with 3 names)
+2 unsatisfiable dependencies (solution with 4 names)
a-3: d>1.5
-b-1: d<2.0
c-1: d>1.0