Author: mlschroe Date: Thu Jun 19 12:23:51 2008 New Revision: 10398 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10398&view=rev Log: - fix test suite Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug220999-test.solution trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug220999-test.xml trunk/sat-solver/testsuite/data.libzypp/lock-tests/exercise-obscureobsoletes-03-test.solution trunk/sat-solver/testsuite/data.libzypp/lock-tests/exercise-obscureobsoletes-03-test.xml trunk/sat-solver/testsuite/data.libzypp/solution-tests/pattern_obsolete-test.solution trunk/sat-solver/testsuite/data.libzypp/solution-tests/pattern_obsolete-test.xml trunk/sat-solver/testsuite/data.libzypp/yast-tests/exercise-04obsoletes-09-test.solution trunk/sat-solver/testsuite/data.libzypp/yast-tests/exercise-04obsoletes-09-test.xml Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug220999-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug220999-test.solution?rev=10398&r1=10397&r2=10398&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug220999-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug220999-test.solution Thu Jun 19 12:23:51 2008 @@ -1,6 +1,5 @@

!> Installing nomorefoo from channel test !> Solution #1: ->!> install nomorefoo-2.0-1.noarch[test] !> remove foo-1.0-1.noarch ->!> remove morefoo-1.0-1.noarch ->!> installs=1, upgrades=0, uninstalls=2 +>!> install nomorefoo-2.0-1.noarch[test] +>!> installs=1, upgrades=0, uninstalls=1

Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug220999-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug220999-test.xml?rev=10398&r1=10397&r2=10398&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug220999-test.xml (original) +++ trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug220999-test.xml Thu Jun 19 12:23:51 2008 @@ -7,7 +7,10 @@ <!-- foo and morefoo (provides foo) is installed, nomorefoo obsoletes foo; installing nomorefoo; - foo AND morefoo should be deleted --> + foo AND morefoo should be deleted + + Not any longer true, obsoletes ignore virtual provides again! +--> <trial> <install channel="test" package="nomorefoo"/> </trial> Modified: trunk/sat-solver/testsuite/data.libzypp/lock-tests/exercise-obscureobsoletes-03-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/lock-tests/exercise-obscureobsoletes-03-test.solution?rev=10398&r1=10397&r2=10398&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/lock-tests/exercise-obscureobsoletes-03-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/lock-tests/exercise-obscureobsoletes-03-test.solution Thu Jun 19 12:23:51 2008 @@ -1,6 +1,4 @@

!> Installing foo2old from channel test !> Solution #1: !> install foo2old-2.0-1.noarch[test] ->!> remove foo-1.0-1.noarch ->!> remove foo-devel-1.1-1.noarch ->!> installs=1, upgrades=0, uninstalls=2 +>!> installs=1, upgrades=0, uninstalls=0

Modified: trunk/sat-solver/testsuite/data.libzypp/lock-tests/exercise-obscureobsoletes-03-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/lock-tests/exercise-obscureobsoletes-03-test.xml?rev=10398&r1=10397&r2=10398&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/lock-tests/exercise-obscureobsoletes-03-test.xml (original) +++ trunk/sat-solver/testsuite/data.libzypp/lock-tests/exercise-obscureobsoletes-03-test.xml Thu Jun 19 12:23:51 2008 @@ -7,6 +7,7 @@ <!-- # obsolete an virtual provides --> foo and foo-devel will be deleted +no longer true, obsoletes ignore virtual provides nowadays --> <trial> <install channel="test" package="foo2old"/> Modified: trunk/sat-solver/testsuite/data.libzypp/solution-tests/pattern_obsolete-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/solution-tests/pattern_obsolete-test.solution?rev=10398&r1=10397&r2=10398&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/solution-tests/pattern_obsolete-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/solution-tests/pattern_obsolete-test.solution Thu Jun 19 12:23:51 2008 @@ -1,31 +1,5 @@ -Load from File './data.libzypp/solution-tests/pattern_obsolete-system.xml.gz' -Added repository '@system' with 3 resolvables -Loaded 3 resolvables from pattern_obsolete-system.xml.gz. -Load from File './data.libzypp/solution-tests/pattern_obsolete-packages.xml.gz' -Added repository 'packages' with 2 resolvables -Loaded 2 resolvables from pattern_obsolete-packages.xml.gz. - ------------------------------------------------- - ->!> Installing pattern:foo4 from channel ->!> Installing pattern:foo5 from channel - -Completed solutions: 1 -Pruned solutions: 0 -Deferred solutions: 0 -Invalid solutions: 0 - -Best Solution:

!> Solution #1: -Checksum = 4ca01a14 +>!> remove pattern:foo3-1.0-1.noarch !> install pattern:foo4-2.0-1.noarch[packages] !> install pattern:foo5-2.0-1.noarch[packages] ->!> remove pattern:foo2-1.0-1.noarch ->!> remove pattern:foo3-1.0-1.noarch ->!> installs=2, upgrades=0, uninstalls=2 -download size=0.0k, install size=0.0k -total priority=0, min priority=0, max priority=0 -other penalties=0

-Context Info: - +>!> installs=2, upgrades=0, uninstalls=1 Modified: trunk/sat-solver/testsuite/data.libzypp/solution-tests/pattern_obsolete-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/solution-tests/pattern_obsolete-test.xml?rev=10398&r1=10397&r2=10398&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/solution-tests/pattern_obsolete-test.xml (original) +++ trunk/sat-solver/testsuite/data.libzypp/solution-tests/pattern_obsolete-test.xml Thu Jun 19 12:23:51 2008 @@ -2,6 +2,7 @@ foo4 obsoletes foo3 ... delete foo3 foo5 obsoletes foo2old, foo2 provides foo2old... do delete foo2 cause it is a virtual provides only + no longer true, obsoletes ignore virtual provides nowadays! --> <test> <setup> Modified: trunk/sat-solver/testsuite/data.libzypp/yast-tests/exercise-04obsoletes-09-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/yast-tests/exercise-04obsoletes-09-test.solution?rev=10398&r1=10397&r2=10398&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/yast-tests/exercise-04obsoletes-09-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/yast-tests/exercise-04obsoletes-09-test.solution Thu Jun 19 12:23:51 2008 @@ -1,6 +1,4 @@

!> Installing G from channel test !> Solution #1: !> install G-1.0-1.noarch[test] ->!> remove libD-1.0-1.noarch ->!> |unflag D-1.0-1.noarch[test] ->!> installs=1, upgrades=0, uninstalls=1 +>!> installs=1, upgrades=0, uninstalls=0

Modified: trunk/sat-solver/testsuite/data.libzypp/yast-tests/exercise-04obsoletes-09-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/yast-tests/exercise-04obsoletes-09-test.xml?rev=10398&r1=10397&r2=10398&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/yast-tests/exercise-04obsoletes-09-test.xml (original) +++ trunk/sat-solver/testsuite/data.libzypp/yast-tests/exercise-04obsoletes-09-test.xml Thu Jun 19 12:23:51 2008 @@ -8,6 +8,7 @@ <!-- # G obsoletes multiple provides of libD. Thats only one problem G +no longer true, obsoletes ignore virtual provides nowadays! --> <trial> <install channel="test" package="G"/> -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org