+ Removed #bisect_files and mode accessor. Just deal with methods onl…

…y for now.

[git-p4: depot-paths = "//src/minitest-bisect/dev/": change = 13112]

lib/minitest/bisect.rb

@@ -51,7 +51,7 @@ def process_flags flags
               RbConfig::CONFIG['ruby_install_name'] +
                 RbConfig::CONFIG['EXEEXT']).sub(/.*\s.*/m, '"\&"')
 
-  attr_accessor :tainted, :failures, :culprits, :mode, :seen_bad
+  attr_accessor :tainted, :failures, :culprits, :seen_bad
   alias :tainted? :tainted
 
   def self.run files
@@ -78,18 +78,14 @@ def run args
 
     cmd = nil
 
-    if :until_I_have_negative_filtering_in_minitest != 0 then
-      mt_flags = args.dup
-      expander = Minitest::Bisect::PathExpander.new mt_flags
+    mt_flags = args.dup
+    expander = Minitest::Bisect::PathExpander.new mt_flags
 
-      files = expander.process
-      rb_flags = expander.rb_flags
-      mt_flags += ["--server", $$]
+    files = expander.process
+    rb_flags = expander.rb_flags
+    mt_flags += ["--server", $$]
 
-      cmd = bisect_methods build_files_cmd(files, rb_flags, mt_flags)
-    else
-      cmd = bisect_methods bisect_files args
-    end
+    cmd = bisect_methods build_files_cmd(files, rb_flags, mt_flags)
 
     puts "Final reproduction:"
     puts
@@ -99,37 +95,7 @@ def run args
     Minitest::Server.stop
   end
 
-  def bisect_files files
-    self.mode = :files
-
-    files, flags = files.partition { |arg| File.file? arg }
-    rb_flags, mt_flags = flags.partition { |arg| arg =~ /^-I/ }
-    mt_flags += ["--server", $$]
-
-    puts "reproducing..."
-    system "#{build_files_cmd files, rb_flags, mt_flags} #{SHH}"
-    abort "Reproduction run passed? Aborting. Try running with MTB_VERBOSE=2 to verify." unless tainted?
-    puts "reproduced"
-
-    found, count = files.find_minimal_combination_and_count do |test|
-      puts "# of culprit files: #{test.size}"
-
-      system "#{build_files_cmd test, rb_flags, mt_flags} #{SHH}"
-
-      self.tainted?
-    end
-
-    puts
-    puts "Minimal files found in #{count} steps:"
-    puts
-    cmd = build_files_cmd found, rb_flags, mt_flags
-    puts cmd
-    cmd
-  end
-
   def bisect_methods cmd
-    self.mode = :methods
-
     time_it "reproducing...", build_methods_cmd(cmd)
 
     unless tainted? then
@@ -245,12 +211,10 @@ def minitest_start
   def minitest_result file, klass, method, fails, assertions, time
     fails.reject! { |fail| Minitest::Skip === fail }
 
-    if mode == :methods then
-      if fails.empty? then
-        culprits << "#{klass}##{method}" unless seen_bad # UGH
-      else
-        self.seen_bad = true
-      end
+    if fails.empty? then
+      culprits << "#{klass}##{method}" unless seen_bad # UGH
+    else
+      self.seen_bad = true
     end
 
     return if fails.empty?

test/minitest/test_bisect.rb

@@ -8,6 +8,7 @@ class TestMinitest::TestBisect < Minitest::Test
 
   def setup
     self.bisect = Minitest::Bisect.new
+    bisect.reset
   end
 
   def test_class_run
@@ -124,9 +125,6 @@ def test_map_failures
   end
 
   def test_minitest_result
-    bisect.mode = :methods
-    bisect.reset
-
     bisect.minitest_result "file.rb", "TestClass", "test_method", [], 1, 1
 
     assert_equal false, bisect.tainted
@@ -135,9 +133,6 @@ def test_minitest_result
   end
 
   def test_minitest_result_skip
-    bisect.mode = :methods
-    bisect.reset
-
     fail = Minitest::Skip.new("woot")
 
     bisect.minitest_result "file.rb", "TestClass", "test_method", [fail], 1, 1
@@ -148,9 +143,6 @@ def test_minitest_result_skip
   end
 
   def test_minitest_result_fail
-    bisect.mode = :methods
-    bisect.reset
-
     fail = Minitest::Assertion.new "msg"
 
     bisect.minitest_result "file.rb", "TestClass", "test_method", [fail], 1, 1
@@ -163,9 +155,6 @@ def test_minitest_result_fail
   end
 
   def test_minitest_result_error
-    bisect.mode = :methods
-    bisect.reset
-
     fail = Minitest::UnexpectedError.new RuntimeError.new("woot")
 
     bisect.minitest_result "file.rb", "TestClass", "test_method", [fail], 1, 1