Author: aschnell Date: Thu Sep 13 15:06:13 2007 New Revision: 7235 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7235&view=rev Log: - added tests for shared tag Added: trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1a.rb (with props) trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1a.ref.out trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1b.rb (with props) trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1b.ref.out trunk/libzypp-testsuite/pokus/tests/deps-tests/xfail Modified: trunk/libzypp-testsuite/package/libzypp-testsuite-tools.changes trunk/libzypp-testsuite/pokus/pokus.test/pokus_test.exp trunk/repotools/package/libzypp-tools.changes trunk/repotools/zypptools/output/yast.rb Modified: trunk/libzypp-testsuite/package/libzypp-testsuite-tools.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/package/libzypp-testsuite-tools.changes?rev=7235&r1=7234&r2=7235&view=diff ============================================================================== --- trunk/libzypp-testsuite/package/libzypp-testsuite-tools.changes (original) +++ trunk/libzypp-testsuite/package/libzypp-testsuite-tools.changes Thu Sep 13 15:06:13 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 13 15:04:38 CEST 2007 - aschnell@suse.de + +- added tests for shared tag + +------------------------------------------------------------------- Thu Aug 30 21:20:11 CEST 2007 - aschnell@suse.de - adopted to new exception logging Modified: trunk/libzypp-testsuite/pokus/pokus.test/pokus_test.exp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/pokus.test/pokus_test.exp?rev=7235&r1=7234&r2=7235&view=diff ============================================================================== --- trunk/libzypp-testsuite/pokus/pokus.test/pokus_test.exp (original) +++ trunk/libzypp-testsuite/pokus/pokus.test/pokus_test.exp Thu Sep 13 15:06:13 2007 @@ -63,6 +63,11 @@ normalise_logfile $dircase/$tmperrfile normalise_logfile $dircase/$tmpoutfile + if { $expect_to_fail == 1 } { + xfail $testBase_name + continue + } + # check optional referr if { [ file exists $dircase/$referrfile ] != 0 } { if { [ diff $dircase/$referrfile $dircase/$tmperrfile ] != 1 } { Added: trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1a.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1a.rb?rev=7235&view=auto ============================================================================== --- trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1a.rb (added) +++ trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1a.rb Thu Sep 13 15:06:13 2007 @@ -0,0 +1,42 @@ +#!/usr/bin/ruby + + +# Test sharing tags. + + +require 'zypptools/lib/package' +require 'zypptools/output/output' +include ZYppTools + +require '../../src/testsuite' + + +packages = Array.new() + +pkg = Package.new("black-cat") +pkg.arch = "i586" +pkg.version = "1.2" +pkg.release = 1 +pkg.summary = "Comet 460" +packages.push(pkg) + +pkg = Package.new("black-cat") +pkg.arch = "i686" +pkg.version = "1.2" +pkg.release = 1 +pkg.shared = "black-cat 1.2 1 i586" +packages.push(pkg) + + +path = Testsuite::write_repo(:yast, packages) + + +Testsuite::set_arch("i586") +pool = Testsuite::read_repo("file://" + path) + +Testsuite::haha2(pool).each do |res| + puts "#{res.kind_to_s} #{res.name} #{res.edition.to_s} #{res.arch.to_s}" + Testsuite::dump_deps(res, Dep.PROVIDES) + puts " Summary: #{res.summary}" + puts +end Added: trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1a.ref.out URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1a.ref.out?rev=7235&view=auto ============================================================================== --- trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1a.ref.out (added) +++ trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1a.ref.out Thu Sep 13 15:06:13 2007 @@ -0,0 +1,9 @@ +package black-cat 1.2-1 i586 + Provides: black-cat == 1.2-1 + Summary: Comet 460 + +product SUSE_LINUX 10.3 i586 + Provides: SUSE_LINUX == 10.3 + Provides: openSUSE-10.3 == 10.3 + Summary: openSUSE 10.3 + Added: trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1b.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1b.rb?rev=7235&view=auto ============================================================================== --- trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1b.rb (added) +++ trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1b.rb Thu Sep 13 15:06:13 2007 @@ -0,0 +1,42 @@ +#!/usr/bin/ruby + + +# Test sharing tags. + + +require 'zypptools/lib/package' +require 'zypptools/output/output' +include ZYppTools + +require '../../src/testsuite' + + +packages = Array.new() + +pkg = Package.new("black-cat") +pkg.arch = "i686" +pkg.version = "1.2" +pkg.release = 1 +pkg.summary = "Comet 460" +packages.push(pkg) + +pkg = Package.new("black-cat") +pkg.arch = "i586" +pkg.version = "1.2" +pkg.release = 1 +pkg.shared = "black-cat 1.2 1 i686" +packages.push(pkg) + + +path = Testsuite::write_repo(:yast, packages) + + +Testsuite::set_arch("i586") +pool = Testsuite::read_repo("file://" + path) + +Testsuite::haha2(pool).each do |res| + puts "#{res.kind_to_s} #{res.name} #{res.edition.to_s} #{res.arch.to_s}" + Testsuite::dump_deps(res, Dep.PROVIDES) + puts " Summary: #{res.summary}" + puts +end Added: trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1b.ref.out URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1b.ref.out?rev=7235&view=auto ============================================================================== --- trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1b.ref.out (added) +++ trunk/libzypp-testsuite/pokus/tests/deps-tests/shared1b.ref.out Thu Sep 13 15:06:13 2007 @@ -0,0 +1,9 @@ +package black-cat 1.2-1 i586 + Provides: black-cat == 1.2-1 + Summary: Comet 460 + +product SUSE_LINUX 10.3 i586 + Provides: SUSE_LINUX == 10.3 + Provides: openSUSE-10.3 == 10.3 + Summary: openSUSE 10.3 + Added: trunk/libzypp-testsuite/pokus/tests/deps-tests/xfail URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/pokus/tests/deps-tests/xfail?rev=7235&view=auto ============================================================================== --- trunk/libzypp-testsuite/pokus/tests/deps-tests/xfail (added) +++ trunk/libzypp-testsuite/pokus/tests/deps-tests/xfail Thu Sep 13 15:06:13 2007 @@ -0,0 +1 @@ +shared1b.rb Modified: trunk/repotools/package/libzypp-tools.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/package/libzypp-tools.changes?rev=7235&r1=7234&r2=7235&view=diff ============================================================================== --- trunk/repotools/package/libzypp-tools.changes (original) +++ trunk/repotools/package/libzypp-tools.changes Thu Sep 13 15:06:13 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 13 14:38:13 CEST 2007 - aschnell@suse.de + +- added shared tag to yast output + +------------------------------------------------------------------- Tue Aug 28 10:00:45 CEST 2007 - aschnell@suse.de - include checksum in repomd.xml Modified: trunk/repotools/zypptools/output/yast.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/repotools/zypptools/output/yast.rb?rev=7235&r1=7234&r2=7235&view=diff ============================================================================== --- trunk/repotools/zypptools/output/yast.rb (original) +++ trunk/repotools/zypptools/output/yast.rb Thu Sep 13 15:06:13 2007 @@ -97,6 +97,10 @@ out.puts "-Sup:" end + if pkg.shared + out.puts "=Shr: #{pkg.shared}" + end + end out.close() @@ -154,7 +158,7 @@ out.puts "LINGUAS de en" out.puts "SHORTLABEL SL 10.3" out.puts "LABEL openSUSE 10.3" - out.puts "LABEL.de openSUSE 10.3" + out.puts "LABEL.en openSUSE 10.3" out.puts "DESCRDIR suse/setup/descr" out.puts "DATADIR suse" out.puts "FLAGS update" -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org