7 files changed, 60 insertions, 25 deletions
diff --git a/test/testcases/cleandeps/cleandeps_dup.t b/test/testcases/cleandeps/cleandeps_dup.t
index 7002434..afebcc4 100644
--- a/test/testcases/cleandeps/cleandeps_dup.t
+++ b/test/testcases/cleandeps/cleandeps_dup.t
@@ -13,7 +13,8 @@ system i686 rpm system
 
 # check untargeted
 job distupgrade name A [cleandeps]
-result transaction,problems <inline>
+result transaction,problems,cleandeps <inline>
+#>cleandeps B1-1-1.noarch@system
 #>erase B1-1-1.noarch@system
 #>install B2-1-1.noarch@test
 #>upgrade A-1-1.noarch@system A-2-1.noarch@test
@@ -21,7 +22,8 @@ result transaction,problems <inline>
 # check targeted
 nextjob
 job distupgrade name A = 2 [cleandeps]
-result transaction,problems <inline>
+result transaction,problems,cleandeps <inline>
+#>cleandeps B1-1-1.noarch@system
 #>erase B1-1-1.noarch@system
 #>install B2-1-1.noarch@test
 #>upgrade A-1-1.noarch@system A-2-1.noarch@test
@@ -29,5 +31,15 @@ result transaction,problems <inline>
 # check targeted to 1-2
 nextjob
 job distupgrade name A = 1-2 [cleandeps]
-result transaction,problems <inline>
+result transaction,problems,cleandeps <inline>
 #>upgrade A-1-1.noarch@system A-1-2.noarch@test
+
+# check all packages
+nextjob
+job distupgrade all packages [cleandeps]
+result transaction,problems,cleandeps <inline>
+#>cleandeps B1-1-1.noarch@system
+#>erase B1-1-1.noarch@system
+#>install B2-1-1.noarch@test
+#>upgrade A-1-1.noarch@system A-2-1.noarch@test
+
diff --git a/test/testcases/cleandeps/cleandeps_in.t b/test/testcases/cleandeps/cleandeps_in.t
index 3edacb5..e77a7f7 100644
--- a/test/testcases/cleandeps/cleandeps_in.t
+++ b/test/testcases/cleandeps/cleandeps_in.t
@@ -9,7 +9,8 @@ repo test 0 testtags <inline>
 #>=Pkg: B2 1 1 noarch
 system i686 rpm system
 job install name A = 2 [cleandeps]
-result transaction,problems <inline>
+result transaction,problems,cleandeps <inline>
+#>cleandeps B1-1-1.noarch@system
 #>erase B1-1-1.noarch@system
 #>install B2-1-1.noarch@test
 #>upgrade A-1-1.noarch@system A-2-1.noarch@test
diff --git a/test/testcases/cleandeps/cleandeps_up.t b/test/testcases/cleandeps/cleandeps_up.t
index 9bb26d2..5560a28 100644
--- a/test/testcases/cleandeps/cleandeps_up.t
+++ b/test/testcases/cleandeps/cleandeps_up.t
@@ -2,6 +2,9 @@ repo system 0 testtags <inline>
 #>=Pkg: A 1 1 noarch
 #>=Req: B1
 #>=Pkg: B1 1 1 noarch
+#>=Pkg: C 1 1 noarch
+#>=Rec: D
+#>=Pkg: D 1 1 noarch
 repo test 0 testtags <inline>
 #>=Pkg: A 1 2 noarch
 #>=Req: B1
@@ -9,11 +12,15 @@ repo test 0 testtags <inline>
 #>=Req: B2 = 1
 #>=Pkg: B1 1 1 noarch
 #>=Pkg: B2 1 1 noarch
+#>=Pkg: C 1 1 noarch
+#>=Rec: D
 system i686 rpm system
 
 # check untargeted
 job update name A [cleandeps]
-result transaction,problems <inline>
+job update name C [cleandeps]
+result transaction,problems,cleandeps <inline>
+#>cleandeps B1-1-1.noarch@system
 #>erase B1-1-1.noarch@system
 #>install B2-1-1.noarch@test
 #>upgrade A-1-1.noarch@system A-2-1.noarch@test
@@ -21,7 +28,8 @@ result transaction,problems <inline>
 # check targeted
 nextjob
 job update name A = 2 [cleandeps]
-result transaction,problems <inline>
+result transaction,problems,cleandeps <inline>
+#>cleandeps B1-1-1.noarch@system
 #>erase B1-1-1.noarch@system
 #>install B2-1-1.noarch@test
 #>upgrade A-1-1.noarch@system A-2-1.noarch@test
@@ -29,5 +37,14 @@ result transaction,problems <inline>
 # check targeted to 1-2
 nextjob
 job update name A = 1-2 [cleandeps]
-result transaction,problems <inline>
+result transaction,problems,cleandeps <inline>
 #>upgrade A-1-1.noarch@system A-1-2.noarch@test
+
+# check all packages
+nextjob
+job update all packages [cleandeps]
+result transaction,problems,cleandeps <inline>
+#>cleandeps B1-1-1.noarch@system
+#>erase B1-1-1.noarch@system
+#>install B2-1-1.noarch@test
+#>upgrade A-1-1.noarch@system A-2-1.noarch@test
diff --git a/test/testcases/distupgrade/dup_multiversion3.t b/test/testcases/distupgrade/dup_multiversion3.t
index 8be3190..97eb20f 100644
--- 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 f500d9b..8231561 100644
--- 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 6c04348..361649a 100644
--- 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
 
diff --git a/test/testcases/targeted/targeted_up.t b/test/testcases/targeted/targeted_up.t
index 1ab09e4..a3cdd45 100644
--- a/test/testcases/targeted/targeted_up.t
+++ b/test/testcases/targeted/targeted_up.t
@@ -40,7 +40,7 @@ result transaction,problems <inline>
 # second check forced to untargeted
 nextjob
 solverflags noautotarget
-job distupgrade name A = 2-1
+job update name A = 2-1
 result transaction,problems <inline>
 
 # then targeted to D