Fix a few failing test caused by fixed dep resolver

rubygems · Dec 3, 2013 · 36b337b · 36b337b
1 parent 918c4e1
commit 36b337b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/lib/rubygems/resolver.rb b/lib/rubygems/resolver.rb
@@ -297,8 +297,6 @@ def resolve_for needed, specs # :nodoc:
 
         depreq = dep.requester.request
 
-        @conflicts << conflict unless @conflicts.include?(conflict)
-
         state = nil
         until states.empty?
           x = states.pop

diff --git a/test/rubygems/test_gem_resolver.rb b/test/rubygems/test_gem_resolver.rb
@@ -228,14 +228,6 @@ def test_conflict_resolution_only_effects_correct_spec
     res = Gem::Resolver.new([ad, bd], s)
 
     assert_resolves_to [a1, b1, c1, d4], res
-
-    cons = res.conflicts
-
-    assert_equal 1, cons.size
-    con = cons.first
-
-    assert_equal "c (= 1)", con.dependency.to_s
-    assert_equal "c-2", con.activated.full_name
   end
 
   def test_backoff_higher_version_to_satisfy_dep

diff --git a/test/rubygems/test_gem_resolver_git_set.rb b/test/rubygems/test_gem_resolver_git_set.rb
@@ -42,7 +42,7 @@ def test_find_all
     @set.add_git_gem name, repository, 'master', false
 
     dependency = dep 'a', '~> 1.0'
-    req = Gem::Resolver::ActivationRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
     @set.prefetch @reqs
@@ -66,7 +66,7 @@ def test_prefetch
     @set.add_git_gem name, repository, 'master', false
 
     dependency = dep name
-    req = Gem::Resolver::ActivationRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
     @set.prefetch @reqs
@@ -80,7 +80,7 @@ def test_prefetch_cache
     @set.add_git_gem name, repository, 'master', false
 
     dependency = dep name
-    req = Gem::Resolver::ActivationRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
     @set.prefetch @reqs
@@ -98,7 +98,7 @@ def test_prefetch_filter
     @set.add_git_gem name, repository, 'master', false
 
     dependency = dep 'b'
-    req = Gem::Resolver::ActivationRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
     @set.prefetch @reqs
@@ -112,7 +112,7 @@ def test_prefetch_root_dir
     @set.add_git_gem name, repository, 'master', false
 
     dependency = dep name
-    req = Gem::Resolver::ActivationRequest.new dependency, nil
+    req = Gem::Resolver::DependencyRequest.new dependency, nil
     @reqs.add req
 
     @set.root_dir = "#{@gemhome}2"

diff --git a/test/rubygems/test_gem_resolver_requirement_list.rb b/test/rubygems/test_gem_resolver_requirement_list.rb
@@ -9,10 +9,11 @@ def setup
   end
 
   def test_each
-    @list.add 1
-    @list.add 2
+    dep = Gem::Dependency.new "a", "= 1"
+    req = Gem::Resolver::DependencyRequest.new(dep, nil)
+    @list.add req
 
-    assert_equal [1, 2], @list.each.to_a
+    assert_equal [req], @list.each.to_a
   end
 
 end