just installing the patch will also upgrade the package

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 a242833d12a39e89a1eaee53c89696be30036238..b8abc34e7784b8455d276d66f5a33251c48ff421 100644 (file)
--- a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-8-test.xml
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-8-test.xml
@@ -5,7 +5,7 @@
    Patch-A-1.1 is available
    Patch-A-1.1 is to be installed
 
-   : Patch-A-1-1 is installed
+   : Error: Patch-A-1-1 does not apply 
 -->
 <test allow_virtual_conflicts="yes">
 <setup>

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-9-test.solution b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-9-test.solution
new file mode 100644 (file)
index 0000000..a211bc2
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-9-test.solution
@@ -0,0 +1,13 @@
+>!> Establishing state ...
+>!> Establishing patch:Patch-A-1.1-1[test]
+>!> Established context
+>!> patch:Patch-A-1.1-1[test] incomplete
+>!> Installing Patch-A from channel test
+>!> Calculating installation order ...
+>!> Solution #1:
+>!> install patch:Patch-A-1.1-1[test]
+>!> upgrade A-1.0-1 => A-1.1-1[test]
+>!> installs=1, upgrades=1, uninstalls=0
+>!> Installation Order:
+>!> A-1.1-1[test]
+>!> patch:Patch-A-1.1-1[test]

diff --git a/testsuite/solver/data.deptestomatic/freshen-tests/exercise-9-test.xml b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-9-test.xml
new file mode 100644 (file)
index 0000000..b44bcb2
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/freshen-tests/exercise-9-test.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<!--
+   A-1.0 is installed
+   A-1.1 is available
+   Patch-A-1.1 is available
+   Patch-A-1.1 is to be installed
+
+   : A-1.1 is installed
+   : Patch-A-1-1 is installed
+-->
+<test allow_virtual_conflicts="yes">
+<setup>
+  <system file="exercise-1-system.xml"/>
+  <channel name="test" file="exercise-1-packages.xml"/>
+</setup>
+<trial>
+  <establish/>
+  <install channel="test" kind="patch" package="Patch-A"/>
+  <instorder/>
+</trial>
+</test>

diff --git a/testsuite/solver/data.deptestomatic/not_used/freshen-tests/exercise-9-test.xml b/testsuite/solver/data.deptestomatic/not_used/freshen-tests/exercise-9-test.xml
deleted file mode 100644 (file)
index 584ef31..0000000
--- a/testsuite/solver/data.deptestomatic/not_used/freshen-tests/exercise-9-test.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   A-1.0 is installed
-   A-1.1 is available
-   Patch-A-1.1 is available
-   Patch-A-1.1 is to be installed
-
-   : A-1.1 is installed
-   : Patch-A-1-1 is installed
--->
-<test allow_virtual_conflicts="yes">
-<setup>
-  <system file="exercise-1-system.xml"/>
-  <channel name="test" file="exercise-1-packages.xml"/>
-</setup>
-<trial>
-  <establish/>
-  <install channel="test" kind="patch" package="Patch-A"/>
-</trial>
-</test>