Skip to content

Commit

Permalink
[api] do not require SUSE's rpm in the testsuite
Browse files Browse the repository at this point in the history
Weak dependencies are great to have, but the build service works without them
  • Loading branch information
coolo committed Jun 15, 2013
1 parent d4cf39f commit 25867bc
Showing 1 changed file with 12 additions and 10 deletions.
22 changes: 12 additions & 10 deletions src/api/test/functional/maintenance_test.rb
Expand Up @@ -1273,14 +1273,14 @@ def test_create_maintenance_project_and_release_packages
hashed = Xmlhash.parse(io.read)
end
pac = nil
hashed["package"].each do |p|
next unless p["name"].to_s == "package"
next unless p["arch"].to_s == "x86_64"
hashed.elements("package") do |p|
next unless p["name"] == "package"
next unless p["arch"] == "x86_64"
pac = p
end
assert_not_nil pac
assert_equal "GPLv2+", pac["format"]["rpm:license"].to_s
assert_equal "Development/Tools/Building", pac["format"]["rpm:group"].to_s
assert_equal "GPLv2+", pac["format"]["rpm:license"]
assert_equal "Development/Tools/Building", pac["format"]["rpm:group"]
assert_equal "package-1.0-1.src.rpm", pac["format"]["rpm:sourcerpm"].to_s
assert_equal "2060", pac["format"]["rpm:header-range"]['end'].to_s
assert_equal "280", pac["format"]["rpm:header-range"]['start'].to_s
Expand All @@ -1290,15 +1290,17 @@ def test_create_maintenance_project_and_release_packages
assert_equal "package(x86-64)", pac["format"]["rpm:provides"]['rpm:entry'][2]['name'].to_s
assert_equal "something", pac["format"]["rpm:conflicts"]['rpm:entry']['name'].to_s
assert_equal "old_crap", pac["format"]["rpm:obsoletes"]['rpm:entry']['name'].to_s
assert_equal "pure_optional", pac["format"]["rpm:suggests"]['rpm:entry']['name'].to_s
assert_equal "would_be_nice", pac["format"]["rpm:recommends"]['rpm:entry']['name'].to_s
assert_equal "other_package_likes_it", pac["format"]["rpm:supplements"]['rpm:entry']['name'].to_s
assert_equal "other_package", pac["format"]["rpm:enhances"]['rpm:entry']['name'].to_s
if File.exist? "/etc/SuSE-release"
assert_equal "pure_optional", pac["format"]["rpm:suggests"]['rpm:entry']['name'].to_s
assert_equal "would_be_nice", pac["format"]["rpm:recommends"]['rpm:entry']['name'].to_s
assert_equal "other_package_likes_it", pac["format"]["rpm:supplements"]['rpm:entry']['name'].to_s
assert_equal "other_package", pac["format"]["rpm:enhances"]['rpm:entry']['name'].to_s
end
# file lists
IO.popen("gunzip -cd #{Rails.root}/tmp/backend_data/repos/BaseDistro2.0:/LinkedUpdateProject/BaseDistro2LinkedUpdateProject_repo/repodata/*-filelists.xml.gz") do |io|
hashed = Xmlhash.parse(io.read)
end
assert_equal "/my_packaged_file", hashed["package"][0]["file"].to_s
assert_equal "/my_packaged_file", hashed["package"][0]["file"]

# verify that local linked packages still get branched correctly
post "/source/BaseDistro2.0/pack2", :cmd => "branch"
Expand Down

0 comments on commit 25867bc

Please sign in to comment.