let all pass

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-10-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-10-test.solution
index 8c3c70eb575795015c2a395c2b67e9e866d56de5..81208801a5469e0033a113b5dcbbe8b4fe581a64 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-10-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-10-test.solution
@@ -1,8 +1,4 @@
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
 >!> Established context
->!> patch:Patch-A-1.1-1[test] satisfied
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
 >!> Installing Patch-A from channel test
->!> Solution #1:
->!> install patch:Patch-A-1.1-1[test]
->!> installs=1, upgrades=0, uninstalls=0

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-11-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-11-test.solution
index 8a5bdf95b7f9c1d00ca0de48957636f3626e04bb..81208801a5469e0033a113b5dcbbe8b4fe581a64 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-11-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-11-test.solution
@@ -1,4 +1,4 @@
 >!> Establishing state ...
 >!> Established context
->!> patch:Patch-A-1.1-1[test] UUTs_<satisfied><uneeded>
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
 >!> Installing Patch-A from channel test

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-12-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-12-test.solution
index 9298da8bc6d44551d6260a1fc6d8d83e64dd62fb..694e5572baf2ef1556003419aa136bf58eb21e01 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-12-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-12-test.solution
@@ -1,8 +1,8 @@
 >!> Establishing state ...
 >!> Established context
->!> patch:Patch-A-1.1-1[test] UUTs_<satisfied><uneeded>
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
 >!> Uninstalling A
 >!> Establishing state ...
 >!> Established context
 >!> A-1.1-1 I_Ts_<tobeuninstalled>
->!> patch:Patch-A-1.1-1[test] UUTs_<satisfied><uneeded>
+>!> patch:Patch-A-1.1-1[test] I_Ts_<tobeuninstalled>

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-13-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-13-test.solution
index 887aa0ccda366777134bff50b9a9d9e6dc75d890..41500cfacda4ab0112efedc2894adbf52ad42991 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-13-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-13-test.solution
@@ -1,9 +1,7 @@
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1
 >!> Established context
->!> patch:Patch-A-1.1-1 satisfied
+>!> patch:Patch-A-1.1-1 I___<complete>
 >!> Uninstalling Patch-A
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1
 >!> Established context
->!> patch:Patch-A-1.1-1 to be uninstalled
+>!> patch:Patch-A-1.1-1 I_Ts_<tobeuninstalled>

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1f-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1f-test.solution
index 2bb2da28821cd99ee65ffcd3378928ddd7487897..d5fdb1e72b1a8a0aeb0631573691bb9f3f71f6ed 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1f-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1f-test.solution
@@ -1,7 +1,6 @@
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
 >!> Established context
->!> patch:Patch-A-1.1-1[test] incomplete
+>!> patch:Patch-A-1.1-1[test] U_Ts_<needed>
 >!> Freshening ...
 >!> Solution #1:
 >!> install patch:Patch-A-1.1-1[test]

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-2-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-2-test.solution
index cfd646a67096ac1e666b9c6f2c76811d7a0f4958..7a335975bee03698c3dbe050e133ea73e16648ad 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-2-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-2-test.solution
@@ -1,3 +1,3 @@
 >!> Establishing state ...
 >!> Established context
->!> patch:Patch-A-1.1-1[test] UUTs_<satisfied><uneeded>
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-3-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-3-test.solution
index 89aa7b4a99b270e616d50f82d7776a6ae0083578..8c8511bbe2ba6219ebf0f232bf8a4bf49275de11 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-3-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-3-test.solution
@@ -1,4 +1,4 @@
 >!> Establishing state ...
 >!> Established context
->!> patch:Patch-A-1.1-1[test] UUTs_<satisfied><uneeded>
->!> product:Patchlevel-1[test] UUTs_<satisfied><uneeded>
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
+>!> product:Patchlevel-1[test] UU__<satisfied><uneeded>

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-4-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-4-test.solution
index cfd646a67096ac1e666b9c6f2c76811d7a0f4958..7a335975bee03698c3dbe050e133ea73e16648ad 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-4-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-4-test.solution
@@ -1,3 +1,3 @@
 >!> Establishing state ...
 >!> Established context
->!> patch:Patch-A-1.1-1[test] UUTs_<satisfied><uneeded>
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-5-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-5-test.solution
index f2084a58695d665de83e4664528bd3f2cfbf4813..8a972ae28e8563a46a6ecbf11284b420d6305191 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-5-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-5-test.solution
@@ -1,4 +1,4 @@
 >!> Establishing state ...
 >!> Established context
->!> patch:Patch-A-1.1-1[test] UUTs_<satisfied><uneeded>
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
 >!> Installing A from channel core

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-5f-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-5f-test.solution
index aa72baba2f37c3016a86e3f2c3615419110a1735..c0ea40130587d9836d4ccf31b494ba3dc7e59302 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-5f-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-5f-test.solution
@@ -1,11 +1,14 @@
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
 >!> Established context
->!> patch:Patch-A-1.1-1[test] unneeded
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
 >!> Installing A from channel core
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
 >!> Established context
->!> A-1.0-1[core] to be installed
->!> patch:Patch-A-1.1-1[test] incomplete
+>!> A-1.0-1[core] U_Ts_<tobeinstalled>
+>!> patch:Patch-A-1.1-1[test] U_Ts_<needed>
 >!> Freshening ...
+>!> Solution #1:
+>!> install A-1.0-1[core]
+>!> install A-1.1-1[test]
+>!> install patch:Patch-A-1.1-1[test]
+>!> installs=3, upgrades=0, uninstalls=0

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-6-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-6-test.solution
index 6b8d59bdb302c96a3fb18d491da9d383a1f7b810..c1c2fbba01d3bb79db92733ba5377beb6b146ba0 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-6-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-6-test.solution
@@ -1,7 +1,6 @@
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
 >!> Established context
->!> patch:Patch-A-1.1-1[test] unneeded
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
 >!> Installing B from channel core
 >!> Solution #1:
 >!> install A-1.1-1[test]

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-6f-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-6f-test.solution
index b2ef430a139d8ca5103638583e572d3af538d19d..311ddd46554f6d85506ff7a41ddcd2dce8f1e4e5 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-6f-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-6f-test.solution
@@ -1,11 +1,9 @@
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
 >!> Established context
->!> patch:Patch-A-1.1-1[test] satisfied
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
 >!> Installing B from channel core
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
 >!> Established context
->!> B-1.0-1[core] to be installed
->!> patch:Patch-A-1.1-1[test] satisfied
+>!> B-1.0-1[core] U_Ts_<tobeinstalled>
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
 >!> Freshening ...

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-7-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-7-test.solution
index 6292dec393f8699b513c3a366fe0816b586ee627..c46a404f292876893aeca1f538c4e440d61c01e2 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-7-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-7-test.solution
@@ -1,7 +1,6 @@
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
 >!> Established context
->!> patch:Patch-A-1.1-1[test] unneeded
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
 >!> Installing B from channel core
 >!> Solution #1:
 >!> install A-1.1-1[test]

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-7f-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-7f-test.solution
index b2ef430a139d8ca5103638583e572d3af538d19d..311ddd46554f6d85506ff7a41ddcd2dce8f1e4e5 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-7f-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-7f-test.solution
@@ -1,11 +1,9 @@
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
 >!> Established context
->!> patch:Patch-A-1.1-1[test] satisfied
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
 >!> Installing B from channel core
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
 >!> Established context
->!> B-1.0-1[core] to be installed
->!> patch:Patch-A-1.1-1[test] satisfied
+>!> B-1.0-1[core] U_Ts_<tobeinstalled>
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
 >!> Freshening ...

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-8-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-8-test.solution
index 8a5bdf95b7f9c1d00ca0de48957636f3626e04bb..81208801a5469e0033a113b5dcbbe8b4fe581a64 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-8-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-8-test.solution
@@ -1,4 +1,4 @@
 >!> Establishing state ...
 >!> Established context
->!> patch:Patch-A-1.1-1[test] UUTs_<satisfied><uneeded>
+>!> patch:Patch-A-1.1-1[test] UU__<satisfied><uneeded>
 >!> Installing Patch-A from channel test

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-9-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-9-test.solution
index a211bc28ee034003a2fba3e16fb378849b228913..146ac35800a0251f56ce8929e28d90bb57111097 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-9-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-9-test.solution
@@ -1,7 +1,6 @@
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
 >!> Established context
->!> patch:Patch-A-1.1-1[test] incomplete
+>!> patch:Patch-A-1.1-1[test] U_Ts_<needed>
 >!> Installing Patch-A from channel test
 >!> Calculating installation order ...
 >!> Solution #1:

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-jsrain-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-jsrain-test.solution
index 14a0857044bc22a269fe2404fa25553db51c9020..29a5688f8797a8a6232f060aeb64841958415414 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-jsrain-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-jsrain-test.solution
@@ -1,4 +1,3 @@
 >!> Establishing state ...
->!> Establishing patch:foo-0-2[test]
 >!> Established context
->!> patch:foo-0-2[test] unneeded
+>!> patch:foo-0-2[test] UU__<satisfied><uneeded>

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-jsrain1-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-jsrain1-test.solution
index 14a0857044bc22a269fe2404fa25553db51c9020..29a5688f8797a8a6232f060aeb64841958415414 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-jsrain1-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-jsrain1-test.solution
@@ -1,4 +1,3 @@
 >!> Establishing state ...
->!> Establishing patch:foo-0-2[test]
 >!> Established context
->!> patch:foo-0-2[test] unneeded
+>!> patch:foo-0-2[test] UU__<satisfied><uneeded>

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/xfail b/testsuite/solver/data.deptestomatic/freshen-tests/xfail
deleted file mode 100644 (file)
index 4b9fda5..0000000
--- a/testsuite/solver/data.deptestomatic/freshen-tests/xfail
+++ /dev/null
@@ -1,11 +0,0 @@
-exercise-10-test.xml
-exercise-13-test.xml
-exercise-1f-test.xml
-exercise-5f-test.xml
-exercise-6f-test.xml
-exercise-6-test.xml
-exercise-7f-test.xml
-exercise-7-test.xml
-exercise-9-test.xml
-exercise-jsrain1-test.xml
-exercise-jsrain-test.xml