nobu	2011-12-15 10:10:45 +0900 (Thu, 15 Dec 2011)

  New Revision: 34046

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34046

  Log:
    * test/ruby/test_require.rb (test_race_exception): get rid of
      not-guaranteed timing issue.  [ruby-core:41655] [Bug #5754]

  Modified files:
    trunk/ChangeLog
    trunk/test/ruby/test_require.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34045)
+++ ChangeLog	(revision 34046)
@@ -1,3 +1,8 @@
+Thu Dec 15 10:10:43 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* test/ruby/test_require.rb (test_race_exception): get rid of
+	  not-guaranteed timing issue.  [ruby-core:41655] [Bug #5754]
+
 Wed Dec 14 21:58:42 2011  NAKAMURA Usaku  <usa@r...>
 
 	* test/ruby/test_io_m17n.rb
Index: test/ruby/test_require.rb
===================================================================
--- test/ruby/test_require.rb	(revision 34045)
+++ test/ruby/test_require.rb	(revision 34046)
@@ -344,7 +344,7 @@
     attr_accessor :scratch
   end
 
-  def test_race_excption
+  def test_race_exception
     bug5754 = '[ruby-core:41618]'
     tmp = Tempfile.new(%w"bug5754 .rb")
     path = tmp.path
@@ -357,7 +357,6 @@
     EOS
     tmp.close
 
-    start = false
     fin = false
 
     TestRequire.scratch = scratch = []
@@ -390,9 +389,9 @@
     assert_nothing_raised(ThreadError, bug5754) {t1.join}
     assert_nothing_raised(ThreadError, bug5754) {t2.join}
 
-    assert_equal([false, true], [t1_res, t2_res], bug5754)
+    assert_equal(true, (t1_res ^ t2_res), bug5754)
     assert_equal([:pre, t2, :post, :t2, :t1], scratch, bug5754)
-
-    tmp.close(true)
+  ensure
+    tmp.close(true) if tmp
   end
 end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/