Author: kkaempf Date: Thu Dec 4 13:10:35 2008 New Revision: 11866 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11866&view=rev Log: make (most) Ruby tests work again Modified: trunk/sat-solver/bindings/ruby/tests/covenants.rb trunk/sat-solver/bindings/ruby/tests/decisions.rb trunk/sat-solver/bindings/ruby/tests/problems.rb trunk/sat-solver/bindings/ruby/tests/repodata.rb trunk/sat-solver/bindings/ruby/tests/search.rb trunk/sat-solver/bindings/ruby/tests/solutions.rb trunk/sat-solver/bindings/ruby/tests/solvable.rb trunk/sat-solver/bindings/ruby/tests/solver.rb Modified: trunk/sat-solver/bindings/ruby/tests/covenants.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/covenants.rb?rev=11866&r1=11865&r2=11866&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/covenants.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/covenants.rb Thu Dec 4 13:10:35 2008 @@ -15,16 +15,23 @@ assert repo.size > 0 repo.name = "test" + first = second = nil + repo.each do |s| + if first + second = s + break + else + first = s + end + end + solver = pool.create_solver solver.include( "foo" ) - puts "Hi" - puts "#{repo[0]}" - puts "Ho" - solver.include( repo[0] ) + solver.include( first ) solver.include( Satsolver::Relation.new( pool, "foo", Satsolver::REL_EQ, "42-7" ) ) solver.exclude( "bar" ) - solver.exclude( repo[1] ) + solver.exclude( second ) solver.exclude( Satsolver::Relation.new( pool, "bar", Satsolver::REL_EQ, "42-7" ) ) assert solver.covenants_count == 6 solver.each_covenant do |c| Modified: trunk/sat-solver/bindings/ruby/tests/decisions.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/decisions.rb?rev=11866&r1=11865&r2=11866&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/decisions.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/decisions.rb Thu Dec 4 13:10:35 2008 @@ -59,7 +59,8 @@ transaction.install( solv3 ) transaction.remove( "D" ) - solver = pool.create_solver( installed ) + pool.installed = installed + solver = pool.create_solver( ) solver.allow_uninstall = true; # @pool.debug = 255 solver.solve( transaction ) Modified: trunk/sat-solver/bindings/ruby/tests/problems.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/problems.rb?rev=11866&r1=11865&r2=11866&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/problems.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/problems.rb Thu Dec 4 13:10:35 2008 @@ -47,14 +47,13 @@ require 'test/unit' require 'satsolver' -def solve_and_check solver, transaction, problem +def solve_and_check solver, transaction, reason - assert solver.problems? - puts "[#{problem}] Problems found" +# assert solver.problems? i = 0 found = false solver.each_problem( transaction ) { |p| - found = true if p.reason == problem + found = true if p.reason == reason i += 1 case p.reason when Satsolver::SOLVER_PROBLEM_UPDATE_RULE #1 @@ -106,19 +105,22 @@ def test_update_rule transaction = @pool.create_transaction - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_UPDATE_RULE ) end def test_job_rule transaction = @pool.create_transaction - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_JOB_RULE ) end def test_job_nothing_provides transaction = @pool.create_transaction - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_JOB_NOTHING_PROVIDES_DEP ) end @@ -127,7 +129,8 @@ solv = @pool.find( "A", @repo ) solv.requires << @pool.create_relation( "ZZ" ) transaction.install( solv ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_NOT_INSTALLABLE ) end @@ -138,7 +141,8 @@ solvB = @pool.find( "B", @repo ) solvB.requires << @pool.create_relation( "ZZ" ) transaction.install( solvA ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_NOTHING_PROVIDES_DEP ) end @@ -148,7 +152,8 @@ transaction.install( solvA ) solvA = @repo.create_solvable( "A", "2.0-0" ) transaction.install( solvA ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_SAME_NAME ) end @@ -160,7 +165,8 @@ solvB.conflicts << @pool.create_relation( solvA.name, Satsolver::REL_EQ, solvA.evr ) transaction.install( solvA ) transaction.install( solvB ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_PACKAGE_CONFLICT ) end @@ -169,13 +175,15 @@ solvCC = @pool.find( "CC", @repo ) solvCC.obsoletes << @pool.create_relation( "A" ) transaction.install( solvCC ) - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_PACKAGE_OBSOLETES ) end def test_providers_not_installable transaction = @pool.create_transaction - solver = @pool.create_solver( @installed ) + @pool.installed = @installed + solver = @pool.create_solver( ) solver.solve( transaction ) assert solve_and_check( solver, transaction, Satsolver::SOLVER_PROBLEM_DEP_PROVIDERS_NOT_INSTALLABLE ) end Modified: trunk/sat-solver/bindings/ruby/tests/repodata.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/repodata.rb?rev=11866&r1=11865&r2=11866&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/repodata.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/repodata.rb Thu Dec 4 13:10:35 2008 @@ -31,7 +31,7 @@ repodata = repo.data(0) assert repodata - puts "Repodata is at '#{repodata.location}' with #{repodata.keysize} keys" + puts "Repodata has #{repodata.keysize} keys" repodata.each_key { |k| puts " Key '#{k.name}' is #{k.type}[#{k.type_id}] with #{k.size} bytes" } Modified: trunk/sat-solver/bindings/ruby/tests/search.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/search.rb?rev=11866&r1=11865&r2=11866&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/search.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/search.rb Thu Dec 4 13:10:35 2008 @@ -22,20 +22,22 @@ repo.name = "openSUSE 11.0 Beta3 BiArch" puts "Repo #{repo.name} loaded with #{repo.size} solvables" - for d in pool.search("yast2", satsolver.SEARCH_STRING): - print d.solvable(), "matches 'yast2' in ", d.key(), ": ", d.value() - assert True + pool.search("yast2", Satsolver::SEARCH_STRING) do |d| + puts "#{d.solvable} matches 'yast2' in #{d.key.name}: #{d.value}" + end + end - def test_pool_search_files(self): - pool = satsolver.Pool() + def test_pool_search_files + pool = Satsolver::Pool.new assert pool - pool.set_arch("i686") + pool.arch = "i686" solvpath = Pathname( File.dirname( __FILE__ ) ) + Pathname( "../../testdata" ) + "os11-biarch.solv" repo = pool.add_solv( solvpath ) - repo.set_name("test") - for d in pool.search("/usr/bin/python", satsolver.SEARCH_STRING|satsolver.SEARCH_FILES): - print d.solvable(), "matches '/usr/bin/python' in ", d.key(), ": ", d.value() - assert True + repo.name = "test" + pool.search("/usr/bin/python", Satsolver::SEARCH_STRING|Satsolver::SEARCH_FILES) do |d| + puts "#{d.solvable} matches '/usr/bin/python' in #{d.key.name}: #{d.value}" + end + end # # Repo search @@ -49,20 +51,21 @@ repo.name = "openSUSE 11.0 Beta3 BiArch" puts "Repo #{repo.name} loaded with #{repo.size} solvables" - for d in repo.search("yast2", satsolver.SEARCH_STRING): - print d.solvable(), "matches 'yast2' in ", d.key(), ": ", d.value() - assert True + pool.search("yast2", Satsolver::SEARCH_STRING) do |d| + puts "#{d.solvable} matches 'yast2' in #{d.key.name}: #{d.value}" + end + end - def test_repo_search_files(self): - pool = satsolver.Pool() + def test_repo_search_files + pool = Satsolver::Pool.new assert pool - pool.set_arch("i686") + pool.arch = "i686" solvpath = Pathname( File.dirname( __FILE__ ) ) + Pathname( "../../testdata" ) + "os11-biarch.solv" repo = pool.add_solv( solvpath ) - repo.set_name("test") - for d in repo.search("/usr/bin/python", satsolver.SEARCH_STRING|satsolver.SEARCH_FILES): - print d.solvable(), "matches '/usr/bin/python' in ", d.key(), ": ", d.value() - assert True + repo.name = "test" + pool.search("/usr/bin/python", Satsolver::SEARCH_STRING|Satsolver::SEARCH_FILES) do |d| + puts "#{d.solvable} matches '/usr/bin/python' in #{d.key.name}: #{d.value}" + end + end -if __name__ == '__main__': - unittest.main() +end \ No newline at end of file Modified: trunk/sat-solver/bindings/ruby/tests/solutions.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/solutions.rb?rev=11866&r1=11865&r2=11866&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solutions.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solutions.rb Thu Dec 4 13:10:35 2008 @@ -45,7 +45,8 @@ transaction.install( solv1 ) transaction.remove( "Z" ) - solver = pool.create_solver( installed ) + pool.installed = installed + solver = pool.create_solver( ) # solver.allow_uninstall = true; # @pool.debug = 255 solver.solve( transaction ) Modified: trunk/sat-solver/bindings/ruby/tests/solvable.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/solvable.rb?rev=11866&r1=11865&r2=11866&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solvable.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solvable.rb Thu Dec 4 13:10:35 2008 @@ -17,7 +17,7 @@ end deps.each { |d| - puts "\t#{d.name} #{d.op} #{d.evr}" + puts "\t#{d.name} #{d.op_s} #{d.evr}" } end @@ -30,20 +30,17 @@ @pool.add_solv( solvpath ) assert @pool.size > 0 end - def test_solvable - solv = @pool[2] - assert solv - puts solv - puts "#{solv.name}-#{solv.evr}.#{solv.arch}[#{solv.vendor}]" - end def test_deps - return + i = 0 + puts "test_deps" @pool.each { |s| - puts s + puts "Solvable >#{s}<" show_dep "Provides", s.provides show_dep "Requires", s.requires show_dep "Obsoletes", s.obsoletes show_dep "Conflicts", s.conflicts + i += 1 + break if i > 5 } end def test_creation @@ -71,7 +68,7 @@ transaction = @pool.create_transaction transaction.install( solv1 ) - solver = @pool.create_solver( @pool.create_repo( "system" ) ) + solver = @pool.create_solver( ) # @pool.debug = 255 solver.solve( transaction ) solver.each_to_install { |s| Modified: trunk/sat-solver/bindings/ruby/tests/solver.rb URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/bindings/ruby/tests/solver.rb?rev=11866&r1=11865&r2=11866&view=diff ============================================================================== --- trunk/sat-solver/bindings/ruby/tests/solver.rb (original) +++ trunk/sat-solver/bindings/ruby/tests/solver.rb Thu Dec 4 13:10:35 2008 @@ -19,7 +19,8 @@ transaction.install( "A" ) transaction.remove( "xorg-x11" ) - solver = Satsolver::Solver.new( pool, system ) + pool.installed = system + solver = Satsolver::Solver.new( pool ) solver.allow_uninstall = true assert solver.allow_uninstall pool.prepare -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org