Author: matz Date: Fri Apr 11 19:42:59 2008 New Revision: 9554 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9554&view=rev Log: Fix all testsuite bugs: * implement <dontinstallrecommended/> tag for deptestomatic * use that in install-digikam-test, bug230685-test, bug308252-test, bug239199-test * update .solution files to reflect unrelated changes in the solutions (bug239199-test doesn't install atoms anymore, which are going away anyway, 3_2-test and bug155368-test simply the particular error package is different) * rewrite Bug255011-1-package.xml.gz to use language/local dependencies that are dealt with in fix_legacy (remove freshens and rewrite to "locale(susehelp:en)" supplements) Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-1-package.xml.gz trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug230685-test.xml trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-test.solution trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-test.xml trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug308252-test.xml trunk/sat-solver/testsuite/data.libzypp/kernel-tests/3_2-test.solution trunk/sat-solver/testsuite/data.libzypp/sat-tests/install-digikam-test.xml trunk/sat-solver/testsuite/data.libzypp/yast-tests/bug155368-test.solution trunk/sat-solver/testsuite/deptestomatic.c trunk/sat-solver/testsuite/runtest.rb Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-1-package.xml.gz URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/Bug255011-1-package.xml.gz?rev=9554&r1=9553&r2=9554&view=diff ============================================================================== Binary files - no diff available. Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug230685-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug230685-test.xml?rev=9554&r1=9553&r2=9554&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug230685-test.xml (original) +++ trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug230685-test.xml Fri Apr 11 19:42:59 2008 @@ -11,5 +11,6 @@ <install channel="9" kind="patch" name="MozillaFirefox2"/> <install channel="9" kind="patch" name="MozillaFirefox"/> <reportproblems/> +<dontinstallrecommended/> </trial> </test> Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-test.solution?rev=9554&r1=9553&r2=9554&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-test.solution Fri Apr 11 19:42:59 2008 @@ -6,64 +6,17 @@

!> Installing kdelibs3 from channel 10 !> Installing k3b from channel 13 !> Solution #1: ->!> !unflag gpg2-1.9.22-20.2.i586[3] ->!> !unflag hal-0.5.8_git20061106-31.1.i586[3] ->!> !unflag lvm2-2.02.13-10.2.i586[3] ->!> !unflag kdebase3-3.5.6-25.2.i586[10] ->!> !unflag kdebase3-ksysguardd-3.5.6-25.2.i586[10] ->!> !unflag kdebase3-beagle-3.5.6-25.2.i586[10] ->!> !unflag cups-1.2.7-3.2.i586[3] ->!> !unflag cups-1.2.7-3.3.i586[3] ->!> !unflag MozillaThunderbird-1.5.0.9-0.1.i586[3] ->!> !unflag libzypp-2.11.2-2.1.i586[3] ->!> !unflag zypper-0.6.15-0.1.i586[3] ->!> !unflag ImageMagick-6.3.0.0-16.2.i586[3] ->!> !unflag compiz-0.2.2-0.1.i586[3] ->!> !unflag mono-winforms-1.1.18.1-12.2.i586[3] ->!> !unflag mono-winforms-1.1.18.1-12.2.x86_64[3] ->!> !unflag libakode-2.0.1-2.5.i586[10] ->!> !unflag kdepim3-3.5.6-9.2.i586[10] ->!> !unflag kdeutils3-3.5.6-10.2.i586[10] ->!> !unflag kdebase3-kdm-3.5.6-25.2.i586[10] ->!> !unflag java-1_5_0-sun-jdbc-1.5.0_update10-2.1.i586[3] ->!> !unflag java-1_4_2-sun-jdbc-1.4.2_update13-3.1.i586[3] ->!> !unflag kdemultimedia3-3.5.6-8.2.i586[10] ->!> !unflag kdenetwork3-3.5.6-9.2.i586[10] ->!> !unflag amarok-1.4.4-47.1.i586[3] ->!> !unflag amarok-libvisual-1.4.4-47.1.i586[3] ->!> !unflag k3b-0.99.1.0rc4-101.mh.1.i686[13] ->!> !unflag kdenetwork3-InstantMessenger-3.5.6-9.2.i586[10] ->!> !unflag kdenetwork3-vnc-3.5.6-9.2.i586[10] ->!> !unflag kdepim3-kpilot-3.5.6-9.2.i586[10] ->!> !unflag xine-lib-1.1.2-40.1.i586[3] ->!> !unflag xine-lib-32bit-1.1.2-40.1.x86_64[3] ->!> !unflag bluez-utils-3.7-29.2.i586[3] ->!> !unflag kdegraphics3-3.5.6-3.3.i586[10] ->!> !unflag kdebindings3-ruby-3.5.6-21.1.i586[10] ->!> !unflag patch:resmgr-2371-0.noarch[3] ->!> !unflag patch:openssl-2349-0.noarch[3] ->!> !unflag patch:cups-2430-0.noarch[3] ->!> !unflag patch:fetchmsttfonts.sh-2333-0.noarch[3] ->!> !unflag patch:neon-2476-0.noarch[3] ->!> !unflag qcomicbook-0.3.4-0.mh.1.i686[13] ->!> !unflag kdemultimedia3-jukebox-3.5.6-8.2.i586[10] ->!> !unflag kdenetwork3-wireless-3.5.6-9.2.i586[10] ->!> !unflag kipi-plugins-0.1.3rc1-3.mh.0.i686[13] ->!> !unflag kdegraphics3-kamera-3.5.6-3.3.i586[10] ->!> !unflag scim-qtimm-0.9.4-7.4.i586[10] ->!> !unflag openvpn-2.0.9-0.mh.1.i686[13] ->!> !unflag keytouch-2.3.0beta-0.mh.0.i686[13] ->!> !unflag wxGTK-2.6.3.3-30.2.i586[3] ->!> !unflag kdepim3-mobile-3.5.6-9.2.i586[10] ->!> !unflag gstreamer010-plugins-moodbar-0.1.2-0.mh.1.i686[13] ->!> !unflag kdegraphics3-scan-3.5.6-3.3.i586[10] +>!> upgrade k3b-0.99.1.0rc4-101.mh.2.x86_64 => k3b-0.99.1.0rc4-101.mh.3.x86_64[13] +>!> upgrade kdelibs3-3.5.5-45.2.x86_64 => kdelibs3-3.5.6-19.1.x86_64[10] !> upgrade kdelibs3-32bit-3.5.5-45.x86_64 => kdelibs3-32bit-3.5.5-45.2.x86_64[3] !> upgrade kdelibs3-arts-3.5.5-45.x86_64 => kdelibs3-arts-3.5.6-19.1.x86_64[10] +>!> upgrade kdelibs3-devel-3.5.5-45.x86_64 => kdelibs3-devel-3.5.6-19.1.x86_64[10] !> upgrade kdelibs3-devel-doc-3.5.5-45.noarch => kdelibs3-devel-doc-3.5.6-20.1.noarch[10] !> upgrade kdelibs3-doc-3.5.5-45.x86_64 => kdelibs3-doc-3.5.6-19.1.x86_64[10] ->!> upgrade kdelibs3-devel-3.5.5-45.x86_64 => kdelibs3-devel-3.5.6-19.1.x86_64[10] ->!> upgrade kdelibs3-3.5.5-45.2.x86_64 => kdelibs3-3.5.6-19.1.x86_64[10] ->!> upgrade k3b-0.99.1.0rc4-101.mh.2.x86_64 => k3b-0.99.1.0rc4-101.mh.3.x86_64[13] ->!> install atom:kdelibs3-3.5.5-45.2.x86_64[3] ->!> install atom:kdelibs3-32bit-3.5.5-45.2.x86_64[3] ->!> installs=2, upgrades=7, uninstalls=0 +>!> !unflag patch:fetchmsttfonts.sh-2333-0.noarch[3] +>!> !unflag qscintilla-1.65-1.3.i586[10] +>!> !unflag scim-qtimm-0.9.4-7.4.i586[10] +>!> !unflag smartmontools-5.36-0.mh.2.x86_64[13] +>!> !unflag xine-lib-32bit-1.1.2-40.1.x86_64[3] +>!> !unflag xine-ui-0.99.4-84.1.x86_64[3] +>!> installs=0, upgrades=7, uninstalls=0

Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-test.xml?rev=9554&r1=9553&r2=9554&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-test.xml (original) +++ trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug239199-test.xml Fri Apr 11 19:42:59 2008 @@ -18,5 +18,6 @@ <install channel="10" kind="package" name="kdelibs3-devel" version="3.5.6" release="19.1" arch="x86_64"/> <install channel="10" kind="package" name="kdelibs3" version="3.5.6" release="19.1" arch="x86_64"/> <install channel="13" kind="package" name="k3b" version="0.99.1.0rc4" release="101.mh.3" arch="x86_64"/> +<dontinstallrecommended/> </trial> </test> Modified: trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug308252-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug308252-test.xml?rev=9554&r1=9553&r2=9554&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug308252-test.xml (original) +++ trunk/sat-solver/testsuite/data.libzypp/bugzilla-tests/bug308252-test.xml Fri Apr 11 19:42:59 2008 @@ -10,5 +10,6 @@ <trial> <establish/> <showpool all="true" prefix=">!> ESTABLISHED:"/> +<dontinstallrecommended/> </trial> </test> Modified: trunk/sat-solver/testsuite/data.libzypp/kernel-tests/3_2-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/kernel-tests/3_2-test.solution?rev=9554&r1=9553&r2=9554&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/kernel-tests/3_2-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/kernel-tests/3_2-test.solution Fri Apr 11 19:42:59 2008 @@ -2,7 +2,7 @@ Problem 1: ==================================== -nothing provides kernel(init) = ad4fb2b5b8e17a1e needed by tpctl-kmp-smp-4.17_2.6.16_rc5_git9_2-17.i586 +nothing provides kernel(kernel) = 51185323fa0b7afe needed by tpctl-kmp-bigsmp-4.17_2.6.16_rc5_git9_2-17.i586 - do not install tpctl-4.17-17.i586 Modified: trunk/sat-solver/testsuite/data.libzypp/sat-tests/install-digikam-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/sat-tests/install-digikam-test.xml?rev=9554&r1=9553&r2=9554&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/sat-tests/install-digikam-test.xml (original) +++ trunk/sat-solver/testsuite/data.libzypp/sat-tests/install-digikam-test.xml Fri Apr 11 19:42:59 2008 @@ -118,5 +118,6 @@ <lock channel="0" kind="package" name="poppler" arch="i586" version="0.5.4" release="100"/> <lock channel="0" kind="package" name="amarok-libvisual" arch="i586" version="1.4.7" release="42.1"/> <install channel="7" name="digikam"/> +<dontinstallrecommended/> </trial> </test> Modified: trunk/sat-solver/testsuite/data.libzypp/yast-tests/bug155368-test.solution URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/data.libzypp/yast-tests/bug155368-test.solution?rev=9554&r1=9553&r2=9554&view=diff ============================================================================== --- trunk/sat-solver/testsuite/data.libzypp/yast-tests/bug155368-test.solution (original) +++ trunk/sat-solver/testsuite/data.libzypp/yast-tests/bug155368-test.solution Fri Apr 11 19:42:59 2008 @@ -2,7 +2,7 @@ Problem 1: ==================================== -package yast2-backup-2.13.1-2.noarch requires autoyast2-installation, but none of the providers can be installed +package autoyast2-installation-2.13.19-2.noarch requires yast2-transfer, but none of the providers can be installed - allow deinstallation of yast2-backup-2.13.1-2.noarch - allow deinstallation of yast2-installation-2.13.28-2.noarch Modified: trunk/sat-solver/testsuite/deptestomatic.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/deptestomatic.c?rev=9554&r1=9553&r2=9554&view=diff ============================================================================== --- trunk/sat-solver/testsuite/deptestomatic.c (original) +++ trunk/sat-solver/testsuite/deptestomatic.c Fri Apr 11 19:42:59 2008 @@ -138,6 +138,7 @@ STATE_SETLICENSEBIT, STATE_INSTORDER, STATE_AVAILABLELOCALES, + STATE_DONTINSTALLRECOMMENDED, NUMSTATES }; @@ -188,6 +189,7 @@ { STATE_TRIAL, "instorder", STATE_INSTORDER, 0 }, { STATE_TRIAL, "availablelocales",STATE_AVAILABLELOCALES, 0 }, { STATE_TRIAL, "keep", STATE_KEEP, 0 }, + { STATE_TRIAL, "dontinstallrecommended", STATE_DONTINSTALLRECOMMENDED, 0 }, { NUMSTATES } @@ -236,6 +238,7 @@ int allowvirtualconflicts; /* 0/1, if conflicts specify package names or package provides */ int allowarchchange; /* 0/1, if packages can change architecture */ int dosplitprovides; /* 0/1, if splitprovides should be looked at */ + int dontinstallrecommended; /* 0/1, if recommends should be ignored */ struct stateswitch *swtab[NUMSTATES]; enum state sbtab[NUMSTATES]; @@ -325,6 +328,7 @@ char dir[PATH_MAX]; int i; + fprintf(stderr, "looking for %s\n", id2str(pool, evr)); if (name == NAMESPACE_LANGUAGE && !ISRELDEP(evr)) { for (i = 0; i < pd->nlanguages; i++) @@ -1308,6 +1312,10 @@ } break; + case STATE_DONTINSTALLRECOMMENDED: + pd->dontinstallrecommended = 1; + break; + case STATE_KEEP: { const char *arch = attrval( atts, "arch" ); const char *version = attrval( atts, "version" ); @@ -1380,6 +1388,7 @@ solv->allowuninstall = pd->allowuninstall; solv->allowarchchange = pd->allowarchchange; solv->dosplitprovides = pd->dosplitprovides; + solv->dontinstallrecommended = pd->dontinstallrecommended; solv->noupdateprovide = 1; // Solve ! Modified: trunk/sat-solver/testsuite/runtest.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/testsuite/runtest.rb?rev=9554&r1=9553&r2=9554&view=diff ============================================================================== --- trunk/sat-solver/testsuite/runtest.rb (original) +++ trunk/sat-solver/testsuite/runtest.rb Fri Apr 11 19:42:59 2008 @@ -373,7 +373,7 @@ cmd += " > " fulldest = File.join( srcdir, destname ) cmd += fulldest - return if File.exists?( fulldest ) + return if File.exists?( fulldest ) && File.mtime( fulldest ) >= File.mtime( srcname ) print "Generating #{fulldest}\n" puts "*** FAILED: #{fulldest}" unless system cmd end -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org