From 6e15b150b216f7b03fbac1042f36d39f752a29da Mon Sep 17 00:00:00 2001
From: Stefan Schubert <schubi@suse.de>
Date: Fri, 3 Nov 2006 11:00:05 +0000
Subject: [PATCH] added new solution: unlock all

---
 .../lock-tests/exercise-obscureobsoletes-02-test.solution            | 5 ++++-
 .../lock-tests/exercise-obscureobsoletes-02-test.xml                 | 2 +-
 .../lock-tests/exercise-obscureobsoletes-06-test.solution            | 5 ++++-
 .../lock-tests/exercise-obscureobsoletes-06-test.xml                 | 2 +-
 .../lock-tests/install-single-require-test.solution                  | 3 +++
 .../solver/data.deptestomatic/yast-tests/Bug156408-test.solution     | 5 ++++-
 testsuite/solver/data.deptestomatic/yast-tests/Bug156408-test.xml    | 2 +-
 .../solver/data.deptestomatic/yast-tests/unfulfilled-test.solution   | 3 +++
 8 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-02-test.solution b/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-02-test.solution
index 4ccd7f4..5906a08 100644
--- a/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-02-test.solution
+++ b/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-02-test.solution
@@ -8,9 +8,12 @@
 >!>       unlock foo
 >!>       
 >!>    Solution:
+>!>       unlock all resolvables
+>!>       
+>!>    Solution:
 >!>       Ignore the obsolete foo in foo2
 >!>       
->!> Taking solution: 1
+>!> Taking solution: 2
 >!> For problem:     0
 >!> No problems so far
 >!> No problems so far
diff --git a/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-02-test.xml b/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-02-test.xml
index 881a95d..7b60573 100644
--- a/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-02-test.xml
+++ b/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-02-test.xml
@@ -13,7 +13,7 @@ foo2 @foo @foo-devel
   <lock package="foo" channel="@system"/>
   <install channel="test" package="foo2"/>
   <reportproblems/>
-  <takesolution problem="0" solution="1"/>
+  <takesolution problem="0" solution="2"/>
   <reportproblems/>
 </trial>
 
diff --git a/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-06-test.solution b/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-06-test.solution
index ccbf2b7..81923d8 100644
--- a/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-06-test.solution
+++ b/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-06-test.solution
@@ -9,9 +9,12 @@
 >!>       unlock bar2
 >!>       
 >!>    Solution:
+>!>       unlock all resolvables
+>!>       
+>!>    Solution:
 >!>       Ignore the obsolete bar2 in barold2
 >!>       
->!> Taking solution: 1
+>!> Taking solution: 2
 >!> For problem:     0
 >!> No problems so far
 >!> No problems so far
diff --git a/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-06-test.xml b/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-06-test.xml
index e890b8f..7f884d6 100644
--- a/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-06-test.xml
+++ b/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-06-test.xml
@@ -14,7 +14,7 @@ barold2 @bar2 @bar2-devel
   <lock package="bar2-devel" channel="@system"/>
   <install channel="test" package="barold2"/>
   <reportproblems/>
-  <takesolution problem="0" solution="1"/>
+  <takesolution problem="0" solution="2"/>
   <reportproblems/>
 </trial>
 
diff --git a/testsuite/solver/data.deptestomatic/lock-tests/install-single-require-test.solution b/testsuite/solver/data.deptestomatic/lock-tests/install-single-require-test.solution
index f6a35ab..b2e3ea5 100644
--- a/testsuite/solver/data.deptestomatic/lock-tests/install-single-require-test.solution
+++ b/testsuite/solver/data.deptestomatic/lock-tests/install-single-require-test.solution
@@ -8,6 +8,9 @@
 >!>       unlock B
 >!>       
 >!>    Solution:
+>!>       unlock all resolvables
+>!>       
+>!>    Solution:
 >!>       do not install A
 >!>       do not install A-1.0-1.noarch[test]
 >!>    Solution:
diff --git a/testsuite/solver/data.deptestomatic/yast-tests/Bug156408-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/Bug156408-test.solution
index 10a957c..f93ccc5 100644
--- a/testsuite/solver/data.deptestomatic/yast-tests/Bug156408-test.solution
+++ b/testsuite/solver/data.deptestomatic/yast-tests/Bug156408-test.solution
@@ -46,12 +46,15 @@
 >!>       unlock suse-release
 >!>       
 >!>    Solution:
+>!>       unlock all resolvables
+>!>       
+>!>    Solution:
 >!>       do not install SUSE LINUX
 >!>       do not install product:SUSE LINUX-1.noarch[sl10_packages]
 >!>    Solution:
 >!>       Ignore this requirement just here
 >!>       
->!> Taking solution: 2
+>!> Taking solution: 3
 >!> For problem:     0
 >!> No problems so far
 >!> No problems so far
diff --git a/testsuite/solver/data.deptestomatic/yast-tests/Bug156408-test.xml b/testsuite/solver/data.deptestomatic/yast-tests/Bug156408-test.xml
index bd6d304..83ea93d 100644
--- a/testsuite/solver/data.deptestomatic/yast-tests/Bug156408-test.xml
+++ b/testsuite/solver/data.deptestomatic/yast-tests/Bug156408-test.xml
@@ -25,7 +25,7 @@
   <reportproblems/>
   <takesolution problem="0" solution="0"/>
   <reportproblems/>
-  <takesolution problem="0" solution="2"/>
+  <takesolution problem="0" solution="3"/>
   <reportproblems/>
 </trial>
 </test>
diff --git a/testsuite/solver/data.deptestomatic/yast-tests/unfulfilled-test.solution b/testsuite/solver/data.deptestomatic/yast-tests/unfulfilled-test.solution
index bdc2acd..3f00f65 100644
--- a/testsuite/solver/data.deptestomatic/yast-tests/unfulfilled-test.solution
+++ b/testsuite/solver/data.deptestomatic/yast-tests/unfulfilled-test.solution
@@ -10,6 +10,9 @@
 >!>       unlock lsb
 >!>       
 >!>    Solution:
+>!>       unlock all resolvables
+>!>       
+>!>    Solution:
 >!>       do not install suseRegister
 >!>       do not install suseRegister-1.0-22.noarch[sles_packages]
 >!>    Solution:
-- 
2.7.4