From 34c6bca38177e32f24c97e85494162b6d782401a Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 25 Dec 2007 05:08:04 +0000 Subject: [PATCH] * test/rinda/test_rinda.rb (MockClock#{_forward, forwrd, sleep}): Change default value of n as @reso from nil. If default value is nil, n.+ is not defined. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ test/rinda/test_rinda.rb | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4411581cf2..fb67f342ef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Tue Dec 25 14:03:48 2007 NARUSE, Yui + + * test/rinda/test_rinda.rb (MockClock#{_forward, forwrd, sleep}): + Change default value of n as @reso from nil. If default value is + nil, n.+ is not defined. + Tue Dec 25 13:54:01 2007 Tanaka Akira * test/ruby/test_io_m17n.rb (test_pipe): fixed. diff --git a/test/rinda/test_rinda.rb b/test/rinda/test_rinda.rb index ba08e26d78..d796546a3d 100644 --- a/test/rinda/test_rinda.rb +++ b/test/rinda/test_rinda.rb @@ -33,14 +33,14 @@ class MockClock n end - def _forward(n=nil) + def _forward(n=@reso) now ,= @ts.take([nil, :now]) @now = now + n n = @reso if n.nil? @ts.write([@now, :now]) end - def forward(n=nil) + def forward(n=@reso) while n > 0 _forward(@reso) n -= @reso @@ -55,7 +55,7 @@ class MockClock @ts.write([2, :now]) end - def sleep(n=nil) + def sleep(n=@reso) while will_deadlock? n -= @reso forward