new testcase with conflicting upgrades

add resolvePool() to testcases

diff --git a/testsuite/solver/data.deptestomatic/distupgrade-tests/conflicting-multiple-rename-package.xml b/testsuite/solver/data.deptestomatic/distupgrade-tests/conflicting-multiple-rename-package.xml
new file mode 100644 (file)
index 0000000..3a32cd3
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/distupgrade-tests/conflicting-multiple-rename-package.xml
@@ -0,0 +1,60 @@
+<channel><subchannel>
+<package>
+  <name>A_new</name>
+  <summary>A fake package</summary>
+  <description>A fake package</description>
+  <section>misc</section>
+  <history>
+    <update>
+      <hid>12345</hid>
+      <epoch>0</epoch>
+      <version>2.0</version>
+      <release>1</release>
+      <filename>foo.bar</filename>
+      <filesize>123</filesize>
+      <installedsize>234</installedsize>
+      <md5sum>0f55f36a3240858038a281911605024e</md5sum>
+      <importance>suggested</importance>
+      <description>Yggdrasil Linux</description>
+    </update>
+  </history>
+  <conflicts>
+    <dep name="A2"/>
+  </conflicts>
+  <provides>
+    <dep name="A"/>
+  </provides>
+  <obsoletes>
+    <dep name="A"/>
+  </obsoletes>
+</package>
+<package>
+  <name>A2</name>
+  <summary>A fake package</summary>
+  <description>A fake package</description>
+  <section>misc</section>
+  <history>
+    <update>
+      <hid>12345</hid>
+      <epoch>0</epoch>
+      <version>2.0</version>
+      <release>1</release>
+      <filename>foo.bar</filename>
+      <filesize>123</filesize>
+      <installedsize>234</installedsize>
+      <md5sum>0f55f36a3240858038a281911605024e</md5sum>
+      <importance>suggested</importance>
+      <description>Yggdrasil Linux</description>
+    </update>
+  </history>
+  <conflicts>
+    <dep name="A_new"/>
+  </conflicts>
+  <provides>
+    <dep name="A"/>
+  </provides>
+  <obsoletes>
+    <dep name="A"/>
+  </obsoletes>
+</package>
+</subchannel></channel>

diff --git a/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.solution b/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.solution
new file mode 100644 (file)
index 0000000..5be1df8
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.solution
@@ -0,0 +1,12 @@
+>!> Doing distribution upgrade ...
+>!>1: I___[package]A-1.0-1.
+>!>2: U_Tl_[package]A2-2.0-1.
+>!>3: U___[package]A_new-2.0-1.
+>!> Solution #1:
+>!> install A2-2.0-1[upgrade]
+>!> remove  A-1.0-1
+>!> |unflag A_new-2.0-1[upgrade]
+>!> installs=1, upgrades=0, uninstalls=1
+>!> Solution #2:
+>!> This solution is a duplicate.
+>!> installs=1, upgrades=0, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.xml b/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.xml
new file mode 100644 (file)
index 0000000..d4c8538
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-conflicting-test.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!--
+   distupgrade rename single package
+-->
+<test>
+<setup>
+  <system file="single-v1-package.xml"/>
+  <channel name="upgrade" file="conflicting-multiple-rename-package.xml"/>
+</setup>
+<trial>
+  <distupgrade/>
+</trial>
+</test>

diff --git a/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution b/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution
index 6220ff9..36cc1e3 100644 (file)
--- a/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution
+++ b/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-multiple-test.solution
@@ -2,3 +2,12 @@
 >!>1: I___[package]A-1.0-1.
 >!>2: U_Tl_[package]A2-2.0-1.
 >!>3: U___[package]A_new-2.0-1.
+>!> Solution #1:
+>!> install A2-2.0-1[upgrade]
+>!> remove  A-1.0-1
+>!> installs=1, upgrades=0, uninstalls=1
+>!> Solution #2:
+>!> install A2-2.0-1[upgrade]
+>!> install A_new-2.0-1[upgrade]
+>!> remove  A-1.0-1
+>!> installs=2, upgrades=0, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution b/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution
index 5a6377e..fc151c1 100644 (file)
--- a/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution
+++ b/testsuite/solver/data.deptestomatic/distupgrade-tests/rename-single-test.solution
@@ -1,3 +1,7 @@
 >!> Doing distribution upgrade ...
 >!>1: I_Tl_[package]A-1.0-1.
 >!>2: U_Tl_[package]A_new-2.0-1.
+>!> Solution #1:
+>!> install A_new-2.0-1[upgrade]
+>!> remove  A-1.0-1
+>!> installs=1, upgrades=0, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/distupgrade-tests/unmaintained-single-test.solution b/testsuite/solver/data.deptestomatic/distupgrade-tests/unmaintained-single-test.solution
index 5b828e0..5487abd 100644 (file)
--- a/testsuite/solver/data.deptestomatic/distupgrade-tests/unmaintained-single-test.solution
+++ b/testsuite/solver/data.deptestomatic/distupgrade-tests/unmaintained-single-test.solution
@@ -1,3 +1,6 @@
 >!> Doing distribution upgrade ...
 >!>1: I_Tl_[package]A-1.0-1.
 >!>2: U___[package]B-2.0-1.
+>!> Solution #1:
+>!> remove  A-1.0-1
+>!> installs=0, upgrades=0, uninstalls=1

diff --git a/testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution b/testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution
index e7d7906..f8b215f 100644 (file)
--- a/testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution
+++ b/testsuite/solver/data.deptestomatic/distupgrade-tests/upgrade-single-test.solution
@@ -1,3 +1,6 @@
 >!> Doing distribution upgrade ...
 >!>1: I___[package]A-1.0-1.
 >!>2: U_Tl_[package]A-2.0-1.
+>!> Solution #1:
+>!> upgrade A-1.0-1 => A-2.0-1[upgrade]
+>!> installs=0, upgrades=1, uninstalls=0