adapt to ResStatus output

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1-test.solution
index 9bd1103..582075c 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1-test.solution
@@ -1,4 +1,3 @@
 >!> 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>

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 487719d..8a5bdf9 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,5 +1,4 @@
 >!> 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] UUTs_<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 52b35d2..9298da8 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,10 +1,8 @@
 >!> 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] UUTs_<satisfied><uneeded>
 >!> Uninstalling A
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
 >!> Established context
->!> A-1.1-1 to be uninstalled
->!> patch:Patch-A-1.1-1[test] unneeded
+>!> A-1.1-1 I_Ts_<tobeuninstalled>
+>!> patch:Patch-A-1.1-1[test] UUTs_<satisfied><uneeded>

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 1046e6f..cfd646a 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,4 +1,3 @@
 >!> 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] UUTs_<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 0620cf7..89aa7b4 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,6 +1,4 @@
 >!> Establishing state ...
->!> Establishing patch:Patch-A-1.1-1[test]
->!> Establishing product:Patchlevel-1[test]
 >!> Established context
->!> patch:Patch-A-1.1-1[test] unneeded
->!> product:Patchlevel-1[test] satisfied
+>!> patch:Patch-A-1.1-1[test] UUTs_<satisfied><uneeded>
+>!> product:Patchlevel-1[test] UUTs_<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 1046e6f..cfd646a 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,4 +1,3 @@
 >!> 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] UUTs_<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 b4c3de1..f2084a5 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,5 +1,4 @@
 >!> 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] UUTs_<satisfied><uneeded>
 >!> Installing A from channel core

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 487719d..8a5bdf9 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,5 +1,4 @@
 >!> 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] UUTs_<satisfied><uneeded>
 >!> Installing Patch-A from channel test