minitest-bisect 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '039c173b7cc6976666b776aaa73002f584a372dcc797362bfed5e7afcf9fe8c1'
-  data.tar.gz: f806ca88ff544455cd14e2ec0f3a7885d6ecb06d57e5b56e3a782a9fab69ad76
+  metadata.gz: 0adf4dd9767c961c0030a23e4e200245d74505bb0c5bd79dc0ff4201adeadc63
+  data.tar.gz: 501678cbbf5567c3408f1e44721dcbb11bc917b8e2d77c7ca063652e5ffc133f
 SHA512:
-  metadata.gz: 72fd7368da5f8f48118d3d6392e2df08ac6a8fe471c55a902606c157a7b8f27bc517f5d6e98f8a1a9c616c1fec6720b8293e06300baad88c22336dcc579f12c9
-  data.tar.gz: f8f6c77ed11d3322871856fbf89da78dbfa2d730eb386a06450aff6fef36abedb55ee9b4eb89e8d6a75c3d12f298db0c35a38771aa6fc6ab75577e8596aac9c9
+  metadata.gz: 3c9f20afc3dcd8cb7e782caaa456e8f9dded619624226c9a7123290cc8cd47abe1ec32afdc1acd61dba41b1d1d1797389296e45f7abc234c27eca3206a8f5473
+  data.tar.gz: 3db4728af1051d31167814e277af68ee39fc0451a3c8df5c45f417a64b7d5fac8e72a9f2b5a590fa816566f1397f91429c1f16d608cba811d361faad246e7f6b

data/History.rdoc

@@ -1,3 +1,9 @@
+=== 1.6.0 / 2022-05-23
+
+* 1 minor enhancement:
+
+  * Removed #bisect_files and mode accessor. Just deal with methods only for now.
+
 === 1.5.1 / 2019-09-22
 
 * 1 bug fix:

data/lib/minitest/bisect.rb

@@ -5,7 +5,7 @@ require "rbconfig"
 require "path_expander"
 
 class Minitest::Bisect
-  VERSION = "1.5.1"
+  VERSION = "1.6.0"
 
   class PathExpander < ::PathExpander
     TEST_GLOB = "**/{test_*,*_test,spec_*,*_spec}.rb" # :nodoc:
@@ -51,7 +51,7 @@ class Minitest::Bisect
               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 @@ class Minitest::Bisect
 
     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 @@ class Minitest::Bisect
     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 @@ class Minitest::Bisect
   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?

data/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 @@ class TestMinitest::TestBisect < Minitest::Test
   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 @@ class TestMinitest::TestBisect < Minitest::Test
   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 @@ class TestMinitest::TestBisect < Minitest::Test
   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 @@ class TestMinitest::TestBisect < Minitest::Test
   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

data/test/minitest/test_find_minimal_combination.rb

@@ -10,93 +10,99 @@ describe Array, :find_minimal_combination do
     lambda { |sample| bad & sample == bad }
   end
 
+  def record_and_check(tests, *bad)
+    lambda { |test| tests << test.join; bad & test == bad }
+  end
+
+  def parse_trials s
+    s.lines.map { |s| s.chomp.sub(/#.*/, '').delete " " }.reject(&:empty?)
+  end
+
   def assert_steps input, bad, exp
     tests = []
 
-    found = input.find_minimal_combination do |test|
-      tests << test
-      bad & test == bad
-    end
+    found = input.find_minimal_combination(&record_and_check(tests, *bad))
 
     assert_equal bad, found, "algorithm is bad"
 
-    assert_equal exp, tests
+    assert_equal parse_trials(exp), tests
   end
 
-  def test_ordering_best_case
-    a   = (0..15).to_a
-    bad = [0, 1]
-    exp = [[0, 1, 2, 3, 4, 5, 6, 7],
-           [0, 1, 2, 3],
-           [0, 1],
-           [0],
-           [1],
-           [0, 1]]
-
-    assert_steps a, bad, exp
+  HEX = "0123456789ABCDEF".chars.to_a
+
+  # lvl      collection
+  #
+  #  0 |         A
+  #  1 |     B       C
+  #  2 |   D   E   F   G
+  #  3 |  H I J K L M N O
+  #    |
+  #  4 |  0123456789ABCDEF
+
+  def test_ordering_best_case_1
+    ary = HEX
+    bad = %w[0]
+    exp = <<~EOT
+      #123456789ABCDEF
+      01234567         # HIT! -- level 1 = B, C
+      0123             # HIT! -- level 2 = D, E
+      01               # HIT! -- level 3 = H, I
+      0                # HIT!
+    EOT
+
+    assert_steps ary, bad, exp
   end
 
-  def test_ordering
-    a     = (0..15).to_a
-    bad   = [0, 15]
-
-    # lvl              collection
-    #
-    #  0 |                 A
-    #  1 |         B               C
-    #  2 |     D       E       F       G
-    #  3 |   H   I   J   K   L   M   N   O
-    #  4 |  0 1 2 3 4 5 6 7 8 9 A B C D E F
-    #
-    #  0    +++++++++++++++++++++++++++++++
-    #  1    ---------------
-    #  1                    ---------------
-    #  2    -------         -------
-    #  2    +++++++                 +++++++
-    #  3    xxxxxxx
-    #  3                            xxxxxxx
-    #  3    ---                     ---
-    #  3    +++                         +++
-    #  4    xxx
-    #  4                                xxx
-    #  4    -                           -
-    #  4    +                             +
-    #
-    #  - = miss
-    #  + = hit
-    #  x = unwanted test
-
-    exp = [
-           # level 1 = B, C
-           [0, 1, 2, 3, 4, 5, 6, 7],
-           [8, 9, 10, 11, 12, 13, 14, 15],
-
-           # level 2 = DF, DG, EF, EG
-           [0, 1, 2, 3, 8, 9, 10, 11],
-           [0, 1, 2, 3, 12, 13, 14, 15],
-
-           # level 3
-           # [0, 1, 2, 3],     # I think this is bad, we've tested B
-           # [12, 13, 14, 15], # again, bad, we've tested C
-           [0, 1, 12, 13],
-           [0, 1, 14, 15],
-
-           # level 4
-           # [0, 1],
-           # [14, 15],
-           [0, 14],
-           [0, 15],
-          ]
-
-    assert_steps a, bad, exp
+  def test_ordering_best_case_2
+    ary = HEX
+    bad = %w[0 1]
+    exp = <<~EOT
+      01234567         # HIT! -- level 1 = B, C
+      0123             # HIT! -- level 2 = D, E
+      01               # HIT! -- level 3 = H, I
+      0                # miss -- level 4 = 0, 1, n_combos = 1
+       1               # miss
+      01               # HIT! -- level 3 = H,    n_combos = 2
+    EOT
+
+    assert_steps ary, bad, exp
   end
 
-  make_my_diffs_pretty!
+  def test_ordering
+    ary = HEX
+    bad = %w[1 F]
+    exp = <<~EOT
+      01234567         # miss -- level 1 = B, C
+              89ABCDEF # miss
+      0123    89AB     # miss -- level 2 = DF, DG, EF, EG
+      0123        CDEF # HIT!
+      01          CD   # miss -- level 3 = HN, HO
+      01            EF # HIT!
+      0             E  # miss -- level 4 = 0E, 0F, 1E, 1F
+      0              F # miss
+       1            E  # miss
+       1             F # HIT!
+    EOT
+
+    assert_steps ary, bad, exp
+  end
 
   def self.test_find_minimal_combination max, *bad
-    define_method "test_find_minimal_combination_#{max}_#{bad.join "_"}" do
+    define_method "%s_%s_%s" % [__method__, max, bad.join("_")] do
       a = (1..max).to_a
-      _(a.find_minimal_combination(&check(*bad))).must_equal bad
+
+      assert_equal bad, a.find_minimal_combination(&check(*bad))
+    end
+  end
+
+  def self.test_find_minimal_combination_and_count max, nsteps, *bad
+    define_method "%s_%s_%s_%s" % [__method__, max, nsteps, bad.join("_")] do
+      a = (1..max).to_a
+
+      found, count = a.find_minimal_combination_and_count(&check(*bad))
+
+      assert_equal bad, found
+      assert_equal nsteps, count
     end
   end
 
@@ -119,7 +125,14 @@ describe Array, :find_minimal_combination do
   test_find_minimal_combination 1023, 7, 15, 166, 1001
   test_find_minimal_combination 1023, 1000, 1001, 1002
   test_find_minimal_combination 1023, 1001, 1003, 1005, 1007
+  test_find_minimal_combination 1024, 1001, 1003, 1005, 1007
+  test_find_minimal_combination 1024, 1, 1024
+
+  test_find_minimal_combination_and_count 1024, 12, 1, 2
+  test_find_minimal_combination_and_count 1024, 23, 1, 1023
+  test_find_minimal_combination_and_count 1024, 24, 1, 1024
+  test_find_minimal_combination_and_count 1023, 26, 1, 1023
 
-  # test_find_minimal_combination 1024, 1001, 1003, 1005, 1007
-  # test_find_minimal_combination 1023, 1001, 1003, 1005, 1007
+  test_find_minimal_combination_and_count 1024, 93, 1001, 1003, 1005, 1007
+  test_find_minimal_combination_and_count 1023, 93, 1001, 1003, 1005, 1007
 end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: minitest-bisect
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Ryan Davis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDPjCCAiagAwIBAgIBAzANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
+  MIIDPjCCAiagAwIBAgIBBjANBgkqhkiG9w0BAQsFADBFMRMwEQYDVQQDDApyeWFu
   ZC1ydWJ5MRkwFwYKCZImiZPyLGQBGRYJemVuc3BpZGVyMRMwEQYKCZImiZPyLGQB
-  GRYDY29tMB4XDTE4MTIwNDIxMzAxNFoXDTE5MTIwNDIxMzAxNFowRTETMBEGA1UE
+  GRYDY29tMB4XDTIxMTIyMzIzMTkwNFoXDTIyMTIyMzIzMTkwNFowRTETMBEGA1UE
   AwwKcnlhbmQtcnVieTEZMBcGCgmSJomT8ixkARkWCXplbnNwaWRlcjETMBEGCgmS
   JomT8ixkARkWA2NvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALda
   b9DCgK+627gPJkB6XfjZ1itoOQvpqH1EXScSaba9/S2VF22VYQbXU1xQXL/WzCkx
@@ -22,14 +22,14 @@ cert_chain:
   qhtV7HJxNKuPj/JFH0D2cswvzznE/a5FOYO68g+YCuFi5L8wZuuM8zzdwjrWHqSV
   gBEfoTEGr7Zii72cx+sCAwEAAaM5MDcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
   HQYDVR0OBBYEFEfFe9md/r/tj/Wmwpy+MI8d9k/hMA0GCSqGSIb3DQEBCwUAA4IB
-  AQCbJwLmpJR2PomLU+Zzw3KRzH/hbyUWc/ftru71AopZ1fy4iY9J/BW5QYKVYwbP
-  V0FSBWtvfI/RdwfKGtuGhPKECZgmLieGuZ3XCc09qPu1bdg7i/tu1p0t0c6163ku
-  nDMDIC/t/DAFK0TY9I3HswuyZGbLW7rgF0DmiuZdN/RPhHq2pOLMLXJmFclCb/im
-  9yToml/06TJdUJ5p64mkBs0TzaK66DIB1Smd3PdtfZqoRV+EwaXMdx0Hb3zdR1JR
-  Em82dBUFsipwMLCYj39kcyHWAxyl6Ae1Cn9r/ItVBCxoeFdrHjfavnrIEoXUt4bU
-  UfBugfLD19bu3nvL+zTAGx/U
+  AQCKB5jfsuSnKb+t/Wrh3UpdkmX7TrEsjVmERC0pPqzQ5GQJgmEXDD7oMgaKXaAq
+  x2m+KSZDrqk7c8uho5OX6YMqg4KdxehfSLqqTZGoeV78qwf/jpPQZKTf+W9gUSJh
+  zsWpo4K50MP+QtdSbKXZwjAafpQ8hK0MnnZ/aeCsW9ov5vdXpYbf3dpg6ADXRGE7
+  lQY2y1tJ5/chqu6h7dQmnm2ABUqx9O+JcN9hbCYoA5i/EeubUEtFIh2w3SpO6YfB
+  JFmxn4h9YO/pVdB962BdBNNDia0kgIjI3ENnkLq0dKpYU3+F3KhEuTksLO0L6X/V
+  YsuyUzsMz6GQA4khyaMgKNSD
   -----END CERTIFICATE-----
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2022-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest-server
@@ -99,14 +99,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '3.23'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '3.23'
 description: |-
   Hunting down random test failures can be very very difficult,
   sometimes impossible, but minitest-bisect makes it easy.
@@ -160,8 +160,9 @@ files:
 homepage: https://github.com/seattlerb/minitest-bisect
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/seattlerb/minitest-bisect
+post_install_message:
 rdoc_options:
 - "--main"
 - README.rdoc
@@ -178,8 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.3.12
+signing_key:
 specification_version: 4
 summary: Hunting down random test failures can be very very difficult, sometimes impossible,
   but minitest-bisect makes it easy