minitest 4.7.3 → 4.7.5

data/History.txt

@@ -1,3 +1,25 @@
+=== 4.7.5 / 2013-06-21
+
+* 2 bug fixes:
+
+  * Fix Spec#describe_stack to be thread local.
+  * Fix multithreaded test failures by defining Time local to mock test namespace
+
+=== 4.7.4 / 2013-05-01
+
+This is probably the last release of the 4.x series. It will be merged
+to ruby and will be put into maintenance mode there.
+
+I'm not set in stone on this, but at this point further development of
+minitest (5+) will be gem-only. It is just too hard to work w/in
+ruby-core w/ test-unit compatibility holding minitest development
+back.
+
+* 2 minor enhancements:
+
+  * Added count/size to ParallelEach to fix use w/in stdlib's test/unit. :( (btaitelb)
+  * Allow disabling of info_signal handler in runner. (erikh)
+
 === 4.7.3 / 2013-04-20
 
 * 1 bug fix:

data/lib/minitest/parallel_each.rb

@@ -48,6 +48,12 @@ class ParallelEach
     }
     threads.map(&:join)
   end
+
+  def count
+    [@queue.size - N, 0].max
+  end
+
+  alias_method :size, :count
 end
 
 class MiniTest::Unit

data/lib/minitest/spec.rb

@@ -135,9 +135,8 @@ class MiniTest::Spec < MiniTest::Unit::TestCase
       }.last
     end
 
-    @@describe_stack = []
     def describe_stack # :nodoc:
-      @@describe_stack
+      Thread.current[:describe_stack] ||= []
     end
 
     ##

data/lib/minitest/unit.rb

@@ -731,7 +731,7 @@ module MiniTest
   end
 
   class Unit # :nodoc:
-    VERSION = "4.7.3" # :nodoc:
+    VERSION = "4.7.5" # :nodoc:
 
     attr_accessor :report, :failures, :errors, :skips # :nodoc:
     attr_accessor :assertion_count                    # :nodoc:
@@ -741,6 +741,17 @@ module MiniTest
     attr_accessor :verbose                            # :nodoc:
     attr_writer   :options                            # :nodoc:
 
+    ##
+    # :attr:
+    #
+    # if true, installs an "INFO" signal handler (only available to BSD and
+    # OS X users) which prints diagnostic information about the test run.
+    #
+    # This is auto-detected by default but may be overridden by custom
+    # runners.
+
+    attr_accessor :info_signal
+
     ##
     # Lazy accessor for options.
 
@@ -987,6 +998,7 @@ module MiniTest
       @errors = @failures = @skips = 0
       @verbose = false
       @mutex = defined?(Mutex) ? Mutex.new : nil
+      @info_signal = Signal.list['INFO']
     end
 
     def synchronize # :nodoc:
@@ -1221,8 +1233,6 @@ module MiniTest
       PASSTHROUGH_EXCEPTIONS = [NoMemoryError, SignalException,
                                 Interrupt, SystemExit] # :nodoc:
 
-      SUPPORTS_INFO_SIGNAL = Signal.list['INFO'] # :nodoc:
-
       ##
       # Runs the tests reporting the status to +runner+
 
@@ -1235,7 +1245,7 @@ module MiniTest
           time = runner.start_time ? Time.now - runner.start_time : 0
           warn "Current Test: %s#%s %.2fs" % [self.class, self.__name__, time]
           runner.status $stderr
-        end if SUPPORTS_INFO_SIGNAL
+        end if runner.info_signal
 
         start_time = Time.now
 
@@ -1269,7 +1279,7 @@ module MiniTest
               result = runner.puke self.class, self.__name__, e
             end
           end
-          trap 'INFO', 'DEFAULT' if SUPPORTS_INFO_SIGNAL
+          trap 'INFO', 'DEFAULT' if runner.info_signal
         end
         result
       end

data/test/minitest/test_minitest_mock.rb

@@ -286,18 +286,22 @@ class TestMiniTestStub < MiniTest::Unit::TestCase
     assert_equal @assertion_count, @tc._assertions
   end
 
+  class Time
+    def self.now
+      24
+    end
+  end
+
   def assert_stub val_or_callable
     @assertion_count += 1
 
-    synchronize do
-      t = Time.now.to_i
-
-      Time.stub :now, val_or_callable do
-        @tc.assert_equal 42, Time.now
-      end
+    t = Time.now.to_i
 
-      @tc.assert_operator Time.now.to_i, :>=, t
+    Time.stub :now, val_or_callable do
+      @tc.assert_equal 42, Time.now
     end
+
+    @tc.assert_operator Time.now.to_i, :>=, t
   end
 
   def test_stub_private_module_method
@@ -345,15 +349,13 @@ class TestMiniTestStub < MiniTest::Unit::TestCase
   def test_stub_block_args
     @assertion_count += 1
 
-    synchronize do
-      t = Time.now.to_i
-
-      Time.stub :now,  lambda { |n| n * 2 } do
-        @tc.assert_equal 42, Time.now(21)
-      end
+    t = Time.now.to_i
 
-      @tc.assert_operator Time.now.to_i, :>=, t
+    Time.stub :now,  lambda { |n| n * 2 } do
+      @tc.assert_equal 42, Time.now(21)
     end
+
+    @tc.assert_operator Time.now.to_i, :>=, t
   end
 
   def test_stub_callable

data/test/minitest/test_minitest_unit.rb

@@ -557,6 +557,10 @@ class TestMiniTestRunner < MetaMetaMetaTestCase
     end
   end
 
+  def test_parallel_each_size
+    assert_equal 0, ParallelEach.new([]).size
+  end
+
   def test_run_parallel
     skip "I don't have ParallelEach debugged yet" if maglev?
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: minitest
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 41
   prerelease: 
   segments: 
   - 4
   - 7
-  - 3
-  version: 4.7.3
+  - 5
+  version: 4.7.5
 platform: ruby
 authors: 
 - Ryan Davis
@@ -36,7 +36,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2013-04-21 00:00:00 Z
+date: 2013-06-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rdoc