summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--test/testunit/test_parallel.rb1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 531941551d..18aebb8fe6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 4 23:09:12 2011 CHIKANAGA Tomoyuki <nagachika00@gmail.com>
+
+ * test/testunit/test_parallel.rb
+ (test_should_run_all_without_any_leaks): consider that the order of
+ testcase could change. [ruby-dev:43300] [Bug #4466]
+
Fri Mar 4 22:01:14 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* io.c (io_cntl): change 'cmd' type to int. ioctl and fcntl need to
diff --git a/test/testunit/test_parallel.rb b/test/testunit/test_parallel.rb
index 8a825e2803..43706e45f2 100644
--- a/test/testunit/test_parallel.rb
+++ b/test/testunit/test_parallel.rb
@@ -154,6 +154,7 @@ module TestParallel
spawn_runner
buf = timeout(10){@test_out.read}
assert_match(/^\.+SF\.+F\.*$/,buf)
+ assert_match(/^\.*(\.SF\.*F|F\.*\.+SF)\.*$/,buf)
end
def test_should_retry_failed_on_workers