<freshen/> -> <establish freshen="1"/>

<establish/> does only calculation, it does not install
<establish freshen="1"/> triggers installs

adapt testcases accordingly

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 ac56f36..4b0263f 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,6 +1,10 @@
 >!> Establishing state ...
 >!> Established context
->!> patch:Patch-A-1.1-1.noarch[test] U_Ts_
+>!> patch:Patch-A-1.1-1.noarch[test] UI_s_
+>!> Establishing state ...
+>!> Established context
+>!> patch:Patch-A-1.1-1.noarch[test] UI_s_
+>!> Freshening ...
 >!> Solution #1:
 >!> install patch:Patch-A-1.1-1.noarch[test]
 >!> upgrade A-1.0-1.noarch => A-1.1-1.noarch[test]

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1-test.xml b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1-test.xml
index 87f0af4..8aee957 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1-test.xml
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1-test.xml
@@ -16,4 +16,7 @@
 <trial>
   <establish/>
 </trial>
+<trial>
+  <establish freshen="1"/>
+</trial>
 </test>

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1f-test.xml b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1f-test.xml
index 2c80b66..0c7fd1c 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1f-test.xml
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-1f-test.xml
@@ -15,6 +15,6 @@
   <channel name="test" file="exercise-1-packages.xml"/>
 </setup>
 <trial>
-  <freshen/>
+  <establish freshen="1"/>
 </trial>
 </test>

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-5f-test.xml b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-5f-test.xml
index 41a1193..3536467 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-5f-test.xml
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-5f-test.xml
@@ -15,6 +15,6 @@
 <trial>
   <establish/>
   <install channel="core" package="A"/>
-  <freshen/>
+  <establish freshen="1"/>
 </trial>
 </test>

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-6f-test.xml b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-6f-test.xml
index 2f7811a..5b74c7d 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-6f-test.xml
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-6f-test.xml
@@ -18,6 +18,6 @@
 <trial>
   <establish/>
   <install channel="core" package="B"/>
-  <freshen/>
+  <establish freshen="1"/>
 </trial>
 </test>

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-7f-test.xml b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-7f-test.xml
index 440829d..85ca06b 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-7f-test.xml
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-7f-test.xml
@@ -24,6 +24,6 @@
 <trial>
   <establish/>
   <install channel="core" package="B"/>
-  <freshen/>
+  <establish freshen="1"/>
 </trial>
 </test>

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 e19e1f1..c2ef6c6 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-8-test.solution
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-8-test.solution
@@ -3,6 +3,14 @@
 >!> patch:Patch-A-1.1-1.noarch[test] UU_s_
 >!> Installing Patch-A from channel test
 >!> Solution #1:
->!> install A-1.1-1.noarch[test]
->!> install patch:Patch-A-1.1-1.noarch[test]
->!> installs=2, upgrades=0, uninstalls=0
+>!> installs=0, upgrades=0, uninstalls=0
+>!> Establishing state ...
+>!> Established context
+>!> patch:Patch-A-1.1-1.noarch[test] UU_s_
+>!> Installing Patch-A from channel test
+>!> Establishing state ...
+>!> Established context
+>!> patch:Patch-A-1.1-1.noarch[test] UU_s_
+>!> Freshening ...
+>!> Solution #1:
+>!> installs=0, upgrades=0, uninstalls=0

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-8-test.xml b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-8-test.xml
index a3e24f0..94a27e8 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-8-test.xml
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-8-test.xml
@@ -17,4 +17,9 @@
   <establish/>
   <install channel="test" kind="patch" package="Patch-A"/>
 </trial>
+<trial>
+  <establish/>
+  <install channel="test" kind="patch" package="Patch-A"/>
+  <establish freshen="1"/>
+</trial>
 </test>