sorah	2011-06-16 08:06:00 +0900 (Thu, 16 Jun 2011)

  New Revision: 32110

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

  Log:
    * test/testunit/test_parallel.rb(test_ignore_tzero): Test for r32109.
    
    * test/testunit/tests_for_parallel/test_third.rb: Use another way to
      detect that test is running on worker. This fixes sometimes
      TestParallel failing.

  Modified files:
    trunk/ChangeLog
    trunk/test/testunit/test_parallel.rb
    trunk/test/testunit/tests_for_parallel/test_third.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32109)
+++ ChangeLog	(revision 32110)
@@ -1,3 +1,11 @@
+Thu Jun 16 07:58:01 2011  Shota Fukumori  <sorah@t...>
+
+	* test/testunit/test_parallel.rb(test_ignore_tzero): Test for r32109.
+
+	* test/testunit/tests_for_parallel/test_third.rb: Use another way to
+	  detect that test is running on worker. This fixes sometimes
+	  TestParallel failing.
+
 Thu Jun 16 07:20:06 2011  Shota Fukumori  <sorah@t...>
 
 	* lib/test/unit.rb(Test::Unit::Runner#_run_parallel): Ignore -j0
Index: test/testunit/tests_for_parallel/test_third.rb
===================================================================
--- test/testunit/tests_for_parallel/test_third.rb	(revision 32109)
+++ test/testunit/tests_for_parallel/test_third.rb	(revision 32110)
@@ -3,7 +3,7 @@
 
 class TestD < TestCaseForParallelTest
   def ptest_fail_at_worker
-    if MiniTest::Unit.output != STDOUT
+    if /test\/unit\/parallel\.rb/ =~ $0
       assert_equal(0,1)
     end
   end
Index: test/testunit/test_parallel.rb
===================================================================
--- test/testunit/test_parallel.rb	(revision 32109)
+++ test/testunit/test_parallel.rb	(revision 32110)
@@ -140,8 +140,15 @@
       end
     end
 
-    #def test_childs
-    #end
+    def test_ignore_jzero
+      @test_out, o = IO.pipe
+      @test_pid = spawn(*@options[:ruby], TESTS+"/runner.rb",
+                        "-j","0", out: File::NULL, err: o)
+      o.close
+      timeout(10) {
+        assert_match(/Error: parameter of -j option should be greater than 0/,@test_out.read)
+      }
+    end
 
     def test_should_run_all_without_any_leaks
       spawn_runner

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