- Make Spec::DSL.describe_stack thread local to avoid failing on my o…

…wn tests.

- Make a fake Time.now local to the tests so they won't interfere with real reporter timings.

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

lib/minitest/spec.rb

@@ -143,9 +143,8 @@ def spec_type desc
       }.last
     end
 
-    @@describe_stack = []
     def describe_stack # :nodoc:
-      @@describe_stack
+      Thread.current[:describe_stack] ||= []
     end
 
     ##

test/minitest/test_minitest_mock.rb

@@ -286,18 +286,22 @@ def teardown
     assert_equal @assertion_count, @tc.assertions
   end
 
+  class Time
+    def self.now
+      24
+    end
+  end
+
   def assert_stub val_or_callable
     @assertion_count += 1
 
-    Minitest::Test.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 @@ def test_stub_block
   def test_stub_block_args
     @assertion_count += 1
 
-    Minitest::Test.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