Adapt test cases to dup rule changes

We now have two solutions: keep the old package or deinstall it.
(I.e. we can either disable the dup rule or the update rule.)

diff --git a/test/testcases/distupgrade/dup_multiversion3.t b/test/testcases/distupgrade/dup_multiversion3.t
index 8be31901e5999262a9adbfa3ed4ecc69b74f9654..97eb20f51bf6e5e2f1eb32f82597b2db213abca6 100644 (file)
--- a/test/testcases/distupgrade/dup_multiversion3.t
+++ b/test/testcases/distupgrade/dup_multiversion3.t
@@ -12,17 +12,18 @@ system i686 * system
 job multiversion name a
 job distupgrade all packages
 result transaction,problems <inline>
-#>problem 251f1f35 info nothing provides c needed by a-2-1.i686
-#>problem 251f1f35 solution 2f2d254c allow a-1-1.i686@system
+#>problem fc3d647e info nothing provides c needed by a-2-1.i686
+#>problem fc3d647e solution 179b72ed allow a-1-1.i686@system
+#>problem fc3d647e solution e5fc66c9 erase a-1-1.i686@system
 
 nextjob
 
 job multiversion name a
 job distupgrade repo available
 result transaction,problems <inline>
-#>erase a-1-1.i686@system
-#>problem 251f1f35 info nothing provides c needed by a-2-1.i686
-#>problem 251f1f35 solution 2f2d254c allow a-1-1.i686@system
+#>problem fc3d647e info nothing provides c needed by a-2-1.i686
+#>problem fc3d647e solution 179b72ed allow a-1-1.i686@system
+#>problem fc3d647e solution e5fc66c9 erase a-1-1.i686@system
 
 ### same with keeporphans
 

diff --git a/test/testcases/distupgrade/dup_noarchchange.t b/test/testcases/distupgrade/dup_noarchchange.t
index f500d9bf10d101a35b1b1858e297cd9c400f2b5d..82315614b00e2b91070770081e3b3a62b675ee3d 100644 (file)
--- a/test/testcases/distupgrade/dup_noarchchange.t
+++ b/test/testcases/distupgrade/dup_noarchchange.t
@@ -9,7 +9,8 @@ system i686 * system
 solverflags !dupallowarchchange
 job distupgrade all packages
 result transaction,problems <inline>
-#>problem c43b1300 info problem with installed package a-1-1.i686
-#>problem c43b1300 solution c43b1300 replace a-1-1.i686@system a-2-1.i586@available
+#>problem 7724e627 info problem with installed package a-1-1.i686
+#>problem 7724e627 solution 25ae2253 allow a-1-1.i686@system
+#>problem 7724e627 solution 2cf4745c replace a-1-1.i686@system a-2-1.i586@available
 #>upgrade a-1-1.i686@system a-2-1.i586@available
 #>upgrade b-1-1.i686@system b-2-1.i686@available

diff --git a/test/testcases/distupgrade/dup_orphan3.t b/test/testcases/distupgrade/dup_orphan3.t
index 6c043488235b5fd23705313376761c782623fbd7..361649ae6ff8707861d44c686813a1b815fb4bc5 100644 (file)
--- a/test/testcases/distupgrade/dup_orphan3.t
+++ b/test/testcases/distupgrade/dup_orphan3.t
@@ -1,6 +1,6 @@
 # test dup with orphaned packages
 #
-# part 3: a is not really an orphan, but cannott be downgraded
+# part 3: a is not really an orphan, but cannot be downgraded
 #
 
 repo system 0 testtags <inline>
@@ -16,8 +16,9 @@ job distupgrade all packages
 result transaction,problems <inline>
 #>downgrade a-1-1.i686@system a-1-0.i686@available
 #>upgrade b-1-1.i686@system b-2-1.i686@available
-#>problem c43b1300 info problem with installed package a-1-1.i686
-#>problem c43b1300 solution c43b1300 replace a-1-1.i686@system a-1-0.i686@available
+#>problem 7724e627 info problem with installed package a-1-1.i686
+#>problem 7724e627 solution 25ae2253 allow a-1-1.i686@system
+#>problem 7724e627 solution 2cf4745c replace a-1-1.i686@system a-1-0.i686@available
 
 nextjob
 
@@ -26,8 +27,9 @@ job distupgrade repo available
 result transaction,problems <inline>
 #>downgrade a-1-1.i686@system a-1-0.i686@available
 #>upgrade b-1-1.i686@system b-2-1.i686@available
-#>problem c43b1300 info problem with installed package a-1-1.i686
-#>problem c43b1300 solution c43b1300 replace a-1-1.i686@system a-1-0.i686@available
+#>problem 7724e627 info problem with installed package a-1-1.i686
+#>problem 7724e627 solution 25ae2253 allow a-1-1.i686@system
+#>problem 7724e627 solution 2cf4745c replace a-1-1.i686@system a-1-0.i686@available
 
 ### keeporphans
 
@@ -38,8 +40,9 @@ job distupgrade all packages
 result transaction,problems <inline>
 #>downgrade a-1-1.i686@system a-1-0.i686@available
 #>upgrade b-1-1.i686@system b-2-1.i686@available
-#>problem c43b1300 info problem with installed package a-1-1.i686
-#>problem c43b1300 solution c43b1300 replace a-1-1.i686@system a-1-0.i686@available
+#>problem 7724e627 info problem with installed package a-1-1.i686
+#>problem 7724e627 solution 25ae2253 allow a-1-1.i686@system
+#>problem 7724e627 solution 2cf4745c replace a-1-1.i686@system a-1-0.i686@available
 
 nextjob
 
@@ -48,9 +51,9 @@ job distupgrade repo available
 result transaction,problems <inline>
 #>downgrade a-1-1.i686@system a-1-0.i686@available
 #>upgrade b-1-1.i686@system b-2-1.i686@available
-#>problem c43b1300 info problem with installed package a-1-1.i686
-#>problem c43b1300 solution c43b1300 replace a-1-1.i686@system a-1-0.i686@available
-
+#>problem 7724e627 info problem with installed package a-1-1.i686
+#>problem 7724e627 solution 25ae2253 allow a-1-1.i686@system
+#>problem 7724e627 solution 2cf4745c replace a-1-1.i686@system a-1-0.i686@available
 
 ### same with allowuninstall