Author: schubi2 Date: Thu May 8 14:20:29 2008 New Revision: 9987 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9987&view=rev Log: testcase for bug 387631 Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/7799216-package.xml.gz (with props) trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/7872304-package.xml.gz (with props) trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-system.xml.gz (with props) trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-test.solution trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-test.xml Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/7799216-package.xml.gz URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/7799216-package.xml.gz?rev=9987&view=auto ============================================================================== Binary file - no diff available. Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/7872304-package.xml.gz URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/7872304-package.xml.gz?rev=9987&view=auto ============================================================================== Binary file - no diff available. Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-system.xml.gz URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-system.xml.gz?rev=9987&view=auto ============================================================================== Binary file - no diff available. Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-test.solution?rev=9987&view=auto ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-test.solution (added) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-test.solution Thu May 8 14:20:29 2008 @@ -0,0 +1,20 @@ +>!> Requesting locale sk_SK +>!> Requesting locale en_US +>!> 1 problems found: +>!> Problem: +>!> perl-DBD-SQLite-1.14-35.x86_64 requires sqlite, but this requirement cannot be provided +>!> +>!> Solution: +>!> Following actions will be done: +>!> deinstallation of perl-DBD-SQLite-1.14-35.x86_64 +>!> Solution: +>!> do not ask to delete all solvables providing sqlite3 +>!> +>!> Solution: +>!> Ignore some dependencies of perl-DBD-SQLite +>!> +>!> Taking solution: 1 +>!> For problem: 0 +>!> No problems so far +>!> No problems so far +>!> Solution : Added: trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-test.xml?rev=9987&view=auto ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-test.xml (added) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/solution-tests/extra-conflict-test.xml Thu May 8 14:20:29 2008 @@ -0,0 +1,49 @@ +<?xml version="1.0"?> +<!-- Extra Conflicts test --> +<test> +<setup arch="x86_64"> + <system file="extra-conflict-system.xml.gz"/> + + <!-- + - alias : openSUSE-DVD 11.0 + - url : cd:///?devices=/dev/sr0 + - path : / + - type : yast2 + --> + <channel file="7799216-package.xml.gz" name="openSUSE-DVD 11.0" /> + + <!-- + - alias : http://download.opensuse.org/repositories/FATE/openSUSE_10.3/ + - url : http://download.opensuse.org/repositories/FATE/openSUSE_10.3/ + - path : / + - type : rpm-md + --> + <channel file="7872304-package.xml.gz" name="http://download.opensuse.org/repositories/FATE/openSUSE_10.3/" /> + + <locale name="sk_SK" /> + <locale name="en_US" /> +</setup> +<trial> +<keep channel="openSUSE-DVD 11.0" kind="package" name="flash-player" arch="i586" version="9.0.124.0" release="5" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="amarok" arch="x86_64" version="1.4.9.1" release="13" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="amarok-libvisual" arch="x86_64" version="1.4.9.1" release="13" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="amarok-yauap" arch="x86_64" version="1.4.9.1" release="13" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="audit" arch="x86_64" version="1.6.8" release="13" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="git" arch="x86_64" version="1.5.4.5" release="10" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="git-svn" arch="x86_64" version="1.5.4.5" release="10" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="gnucash" arch="x86_64" version="2.2.4" release="13" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="gnucash-lang" arch="x86_64" version="2.2.4" release="13" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="kaffeine" arch="x86_64" version="0.8.6" release="42" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="libofx" arch="x86_64" version="0.9.0" release="35" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="opal" arch="x86_64" version="2.2.11" release="69" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="pwlib" arch="x86_64" version="1.10.10" release="71" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="totem" arch="x86_64" version="2.22.0" release="26" status="U__u_"/> +<keep channel="openSUSE-DVD 11.0" kind="package" name="xine-ui" arch="x86_64" version="0.99.5" release="149" status="U__u_"/> +<keep channel="@System" kind="package" name="flash-player" arch="i586" version="9.0.124.0" release="5" status="I__u_"/> +<keep channel="@System" kind="package" name="java-1_5_0-sun-plugin" arch="i586" version="1.5.0_07" release="1.1" status="I__u_"/> +<addConflict name="sqlite3"/> +<reportproblems/> +<takesolution problem="0" solution="1"/> +<reportproblems/> +</trial> +</test> -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org