added conflicting problemSolutions

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/exercise-04obsoletes-01-test.xml b/testsuite/solver/data.deptestomatic/solution-tests/exercise-04obsoletes-01-test.xml
new file mode 100644 (file)
index 0000000..8f50f2a
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/solution-tests/exercise-04obsoletes-01-test.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<test>
+<setup>
+  <system file="exercise-04obsoletes-system.xml"/>
+  <channel name="test" file="exercise-04obsoletes-packages.xml"/>
+</setup>
+
+<!-- foo is installed, but obsoleted by candidate foonew; 
+     reinstalling foo should results to error RESOLVER_INFO_TYPE_CONFLICT_CANT_INSTALL -->
+<trial>
+  <install channel="test" package="foonew"/>
+  <install channel="test" package="foo"/> 
+  <reportproblems/>
+</trial>
+
+</test>

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/exercise-04obsoletes-packages.xml b/testsuite/solver/data.deptestomatic/solution-tests/exercise-04obsoletes-packages.xml
new file mode 100644 (file)
index 0000000..08e7c96
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/solution-tests/exercise-04obsoletes-packages.xml
@@ -0,0 +1,41 @@
+<channel>
+  <subchannel>
+    <package>
+      <name>foo</name>
+      <summary>A fake summary</summary>
+      <description>A fake description</description>
+      <section>misc</section>
+      <history>
+        <update>
+          <hid>12345</hid>
+          <version>2.0</version>
+          <release>1</release>
+          <filename>foo.rpm</filename>
+          <filesize>123</filesize>
+          <installedsize>456</installedsize>
+          <md5sum>0f55f36a3240858038a281911605024e</md5sum>
+        </update>
+      </history>
+    </package>
+    <package>
+      <name>foonew</name>
+      <summary>A fake summary</summary>
+      <description>A fake description</description>
+      <section>misc</section>
+      <history>
+        <update>
+          <hid>12345</hid>
+          <version>2.0</version>
+          <release>1</release>
+          <filename>foonew.rpm</filename>
+          <filesize>123</filesize>
+          <installedsize>456</installedsize>
+          <md5sum>0f55f36a3240858038a281911605024e</md5sum>
+        </update>
+      </history>
+      <obsoletes>
+        <dep name='foo'/>
+      </obsoletes>
+    </package>
+  </subchannel>
+</channel>
\ No newline at end of file

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/exercise-04obsoletes-system.xml b/testsuite/solver/data.deptestomatic/solution-tests/exercise-04obsoletes-system.xml
new file mode 100644 (file)
index 0000000..e92b947
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/solution-tests/exercise-04obsoletes-system.xml
@@ -0,0 +1,21 @@
+<channel>
+  <subchannel>
+    <package>
+      <name>foo</name>
+      <summary>A fake summary</summary>
+      <description>A fake description</description>
+      <section>misc</section>
+      <history>
+        <update>
+          <hid>12345</hid>
+          <version>1.0</version>
+          <release>1</release>
+          <filename>foo.rpm</filename>
+          <filesize>123</filesize>
+          <installedsize>456</installedsize>
+          <md5sum>0f55f36a3240858038a281911605024e</md5sum>
+        </update>
+      </history>
+    </package>
+  </subchannel>
+</channel>
\ No newline at end of file

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/ignore b/testsuite/solver/data.deptestomatic/solution-tests/ignore
index 29db74c..99d57c1 100644 (file)
--- a/testsuite/solver/data.deptestomatic/solution-tests/ignore
+++ b/testsuite/solver/data.deptestomatic/solution-tests/ignore
@@ -1,4 +1,5 @@
 exercise-4-test.xml
 exercise-1-test.xml
 exercise-2-test.xml
-exercise-3-test.xml
\ No newline at end of file
+exercise-3-test.xml
+exercise-04obsoletes-01-test.xml
\ No newline at end of file