solutions for locks added

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 d8fd018..e9e25eb 100644 (file)
--- a/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-02-test.xml
+++ b/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-02-test.xml
@@ -14,6 +14,10 @@ foo2 @foo @foo-devel
   <lock package="foo-devel" channel="@system"/>
   <install channel="test" package="foo2"/>
   <reportproblems/>
+  <takesolution problem="0" solution="1"/>
+  <reportproblems/>
+  <takesolution problem="0" solution="0"/>
+  <reportproblems/>
 </trial>
 
 </test>

diff --git a/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-packages.solution b/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-packages.solution
new file mode 100644 (file)
index 0000000..990434d
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/lock-tests/exercise-obscureobsoletes-packages.solution
@@ -0,0 +1,34 @@
+>!> Locking foo from channel @system
+>!> Locking foo-devel from channel @system
+>!> Installing foo2 from channel test
+>!> 1 problems found:
+>!> Problem:
+>!> foo is locked and cannot be uninstalled.
+>!> foo2 obsoletes foo. But foo cannot be deleted because it is locked.
+>!>    Solution:
+>!>       unlock foo
+>!>       
+>!>    Solution:
+>!>       Ignore the obsolete foo in foo2
+>!>       
+>!> Taking solution: 1
+>!> For problem:     0
+>!> 1 problems found:
+>!> 1 problems found:
+>!> Problem:
+>!> foo-devel is locked and cannot be uninstalled.
+>!> foo2 obsoletes foo-devel. But foo-devel cannot be deleted because it is locked.
+>!>    Solution:
+>!>       unlock foo-devel
+>!>       
+>!>    Solution:
+>!>       Ignore the obsolete foo-devel in foo2
+>!>       
+>!> Taking solution: 0
+>!> For problem:     0
+>!> No problems so far
+>!> No problems so far
+>!> Solution #1:
+>!> install foo2-2.0-1.noarch[test]
+>!> remove  foo-devel-1.1-1.noarch
+>!> installs=1, upgrades=0, uninstalls=1