parallel installation fixed

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/ignore b/testsuite/solver/data.deptestomatic/solution-tests/ignore
index c8a533f..e69de29 100644 (file)
--- a/testsuite/solver/data.deptestomatic/solution-tests/ignore
+++ b/testsuite/solver/data.deptestomatic/solution-tests/ignore
@@ -1 +0,0 @@
-parallel-test.xml

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/parallel-test.solution b/testsuite/solver/data.deptestomatic/solution-tests/parallel-test.solution
new file mode 100644 (file)
index 0000000..d6872fb
--- /dev/null
+++ b/testsuite/solver/data.deptestomatic/solution-tests/parallel-test.solution
@@ -0,0 +1,12 @@
+>!> Installing foo from channel test1
+>!> Installing foo from channel test2
+>!> 1 problems found:
+>!> Problem:
+>!> Cannot install foo
+>!> Can't install foo-2.0-1.noarch[test2], since foo-2.0-1.noarch[test1] is already marked as needing to be installed
+>!>    Solution:
+>!>       do not install foo
+>!>       do not install [package]foo-2.0-1.noarch
+>!>    Solution:
+>!>       Ignore that foo is already set to install
+>!>       

diff --git a/testsuite/solver/data.deptestomatic/solution-tests/parallel-test.xml b/testsuite/solver/data.deptestomatic/solution-tests/parallel-test.xml
index 9358159..83d686d 100644 (file)
--- a/testsuite/solver/data.deptestomatic/solution-tests/parallel-test.xml
+++ b/testsuite/solver/data.deptestomatic/solution-tests/parallel-test.xml
@@ -12,7 +12,6 @@
   <install channel="test1" package="foo"/> 
   <install channel="test2" package="foo"/> 
   <reportproblems/>
-  <takesolution problem="0" solution="1"/>
 </trial>
 
 </test>