@@ -32,7 +32,7 @@ describe "Kernel#sleep" do end lock.receive.should == :ready # wait until the thread has gone to sleep - Thread.pass until t.status == "sleep" + Thread.pass while t.status and t.status != "sleep" t.run t.value.should == 5 end core/kernel/sleep_spec.rb @@ -32,7 +32,7 @@ describe "Thread.critical=" do it "does not change status of other existing threads" do t = ThreadSpecs.create_critical_thread { ScratchPad.record Thread.main.status } - Thread.pass while t.status != false + Thread.pass while t.status and t.status != false ScratchPad.recorded.should == "run" end @@ -71,20 +71,20 @@ describe "Thread.critical=" do it "defers exit" do critical_thread = ThreadSpecs.create_and_kill_critical_thread() - Thread.pass while critical_thread.status != false + Thread.pass while critical_thread.status ScratchPad.recorded.should == "status=aborting" end it "defers exit until Thread.pass" do critical_thread = ThreadSpecs.create_and_kill_critical_thread(true) - Thread.pass while critical_thread.status != false + Thread.pass while critical_thread.status ScratchPad.recorded.should == nil end not_compliant_on(:ironruby) do # requires green threads so that another thread can be scheduled when the critical thread is killed it "is not reset if the critical thread is killed" do critical_thread = ThreadSpecs.create_and_kill_critical_thread(true) - Thread.pass while critical_thread.status != false + Thread.pass while critical_thread.status Thread.critical.should == true Thread.critical = false core/thread/critical_spec.rb @@ -57,7 +57,7 @@ module ThreadSpecs def self.status_of_running_thread t = running_thread - Thread.pass while t.alive? && t.status != "run" + Thread.pass while t.status and t.status != "run" status = Status.new t t.kill t.join @@ -72,7 +72,7 @@ module ThreadSpecs def self.status_of_sleeping_thread t = sleeping_thread - Thread.pass until t.status == 'sleep' + Thread.pass while t.status and t.status != 'sleep' status = Status.new t t.run t.join @@ -83,7 +83,7 @@ module ThreadSpecs m = Mutex.new m.lock t = Thread.new { m.lock } - Thread.pass until t.status == 'sleep' + Thread.pass while t.status and t.status != 'sleep' status = Status.new t m.unlock t.join @@ -103,7 +103,7 @@ module ThreadSpecs def self.status_of_killed_thread t = Thread.new { sleep } - Thread.pass until t.status == 'sleep' + Thread.pass while t.status and t.status != 'sleep' t.kill t.join Status.new t @@ -127,7 +127,7 @@ module ThreadSpecs def self.status_of_dying_sleeping_thread t = dying_thread_ensures { Thread.stop; } - Thread.pass until t.status == 'sleep' + Thread.pass while t.status and t.status != 'sleep' status = Status.new t t.wakeup t.join @@ -165,10 +165,10 @@ module ThreadSpecs end def self.wakeup_dying_sleeping_thread(kill_method_name=:kill) - thread = ThreadSpecs.dying_thread_ensures(kill_method_name) { yield } - Thread.pass until thread.status == "sleep" - thread.wakeup - thread.join + t = ThreadSpecs.dying_thread_ensures(kill_method_name) { yield } + Thread.pass while t.status and t.status != 'sleep' + t.wakeup + t.join end def self.critical_is_reset @@ -225,7 +225,7 @@ module ThreadSpecs critical_thread[:thread_specs] = 101 if isThreadSleep or isThreadStop # Thread#wakeup calls are not queued up. So we need to ensure that the thread is sleeping before calling wakeup - Thread.pass while critical_thread.status != "sleep" + Thread.pass while critical_thread.status and critical_thread.status != "sleep" critical_thread.wakeup end end @@ -240,12 +240,12 @@ module ThreadSpecs @@after_first_sleep = false critical_thread = Thread.new do - Thread.pass while Thread.main.status != "sleep" + Thread.pass while Thread.main.status and Thread.main.status != "sleep" critical_thread1() Thread.main.wakeup yield Thread.pass while @@after_first_sleep != true # Need to ensure that the next statement does not see the first sleep itself - Thread.pass while Thread.main.status != "sleep" + Thread.pass while Thread.main.status and Thread.main.status != "sleep" critical_thread2(isThreadStop) Thread.main.wakeup end core/thread/fixtures/classes.rb @@ -15,7 +15,7 @@ describe "Thread#raise on a sleeping thread" do before :each do ScratchPad.clear @thr = ThreadSpecs.sleeping_thread - Thread.pass while (@thr.alive? && @thr.status != "sleep") + Thread.pass while @thr.status and @thr.status != "sleep" end after :each do @@ -59,7 +59,7 @@ describe "Thread#raise on a sleeping thread" do end end - Thread.pass while t.status != "sleep" + Thread.pass while t.status and t.status != "sleep" t.raise lambda {t.value}.should raise_error(ZeroDivisionError) t.kill @@ -70,7 +70,7 @@ describe "Thread#raise on a running thread" do before :each do ScratchPad.clear @thr = ThreadSpecs.running_thread - Thread.pass while (@thr.alive? && @thr.status != "run") + Thread.pass while @thr.status and @thr.status != "run" end after :each do core/thread/raise_spec.rb @@ -8,7 +8,7 @@ describe :thread_exit, :shared => true do sleep ScratchPad.record :after_sleep end - Thread.pass while sleeping_thread.status != "sleep" + Thread.pass while sleeping_thread.status and sleeping_thread.status != "sleep" sleeping_thread.send(@method) sleeping_thread.join ScratchPad.recorded.should == nil @@ -43,12 +43,12 @@ describe :thread_exit, :shared => true do sleep ensure ScratchPad << :outer_ensure_clause - Thread.pass until inner.status == "sleep" + Thread.pass while inner.status and inner.status != "sleep" inner.send(@method) inner.join end end - Thread.pass until outer.status == "sleep" + Thread.pass while outer.status and outer.status != "sleep" outer.send(@method) outer.join ScratchPad.recorded.should include(:inner_ensure_clause) @@ -77,7 +77,7 @@ describe :thread_exit, :shared => true do it "killing dying sleeping thread wakes up thread" do t = ThreadSpecs.dying_thread_ensures { Thread.stop; ScratchPad.record :after_stop } - Thread.pass until t.status == "sleep" + Thread.pass while t.status and t.status != "sleep" t.send(@method) t.join ScratchPad.recorded.should == :after_stop @@ -157,7 +157,7 @@ describe :thread_exit, :shared => true do it "does not deadlock when called from within the thread while being joined from without" do 100.times do t = Thread.new { Thread.stop; Thread.current.send(@method) } - Thread.pass until t.status == "sleep" + Thread.pass while t.status and t.status != "sleep" t.wakeup.should == t t.join.should == t end core/thread/shared/exit.rb @@ -21,12 +21,12 @@ describe :thread_wakeup, :shared => true do exit_loop = true - Thread.pass while t.status != "sleep" + Thread.pass while t.status and t.status != "sleep" after_sleep1.should == false # t should be blocked on the first sleep t.send(@method) Thread.pass while after_sleep1 != true - Thread.pass while t.status != "sleep" + Thread.pass while t.status and t.status != "sleep" after_sleep2.should == false # t should be blocked on the second sleep t.send(@method) Thread.pass while after_sleep2 != true core/thread/shared/wakeup.rb @@ -4,7 +4,7 @@ require File.dirname(__FILE__) + '/fixtures/classes' describe "Thread.stop" do it "causes the current thread to sleep indefinitely" do t = Thread.new { Thread.stop; 5 } - Thread.pass until t.status == 'sleep' + Thread.pass while t.status and t.status != 'sleep' t.status.should == 'sleep' t.run t.value.should == 5 @@ -12,7 +12,7 @@ describe "Thread.stop" do it "resets Thread.critical to false" do t = Thread.new { Thread.critical = true; Thread.stop } - Thread.pass until t.status == 'sleep' + Thread.pass while t.status and t.status != 'sleep' Thread.critical.should == false t.run t.join core/thread/stop_spec.rb @@ -16,8 +16,8 @@ describe "ThreadGroup#list" do tg.add(th2) (tg.list & [th1, th2]).should include(th1, th2) - Thread.pass until th1.status == 'sleep' || !th1.alive? - Thread.pass until th2.status == 'sleep' || !th2.alive? + Thread.pass while th1.status and th1.status != 'sleep' + Thread.pass while th2.status and th2.status != 'sleep' th1.run; th1.join th2.run; th2.join end core/threadgroup/list_spec.rb @@ -17,7 +17,7 @@ describe "ConditionVariable#broadcast" do end # ensures that th grabs m before current thread - Thread.pass until th.status == "sleep" + Thread.pass while th.status and th.status != "sleep" m.synchronize { cv.broadcast }.should == cv library/conditionvariable/broadcast_spec.rb @@ -17,7 +17,7 @@ describe "ConditionVariable#signal" do end # ensures that th grabs m before current thread - Thread.pass until th.status == "sleep" + Thread.pass while th.status and th.status != "sleep" m.synchronize { cv.signal }.should == cv library/conditionvariable/signal_spec.rb @@ -13,7 +13,7 @@ describe "ConditionVariable#wait" do end # ensures that th grabs m before current thread - Thread.pass until th.status == "sleep" + Thread.pass while th.status and th.status != "sleep" m.synchronize { cv.signal } th.join library/conditionvariable/wait_spec.rb @@ -19,7 +19,7 @@ describe "Mutex#lock" do v = 1 end - Thread.pass until th.status == "sleep" + Thread.pass while th.status and th.status != "sleep" v.should == 0 m.unlock library/mutex/lock_spec.rb @@ -24,7 +24,7 @@ describe "Mutex#locked?" do m2.lock end - Thread.pass until th.status == "sleep" + Thread.pass while th.status and th.status != "sleep" m1.locked?.should be_true m2.unlock # release th library/mutex/locked_spec.rb @@ -16,7 +16,7 @@ describe "Mutex#synchronize" do end.should raise_error(Exception) end - Thread.pass until th.status == "sleep" + Thread.pass while th.status and th.status != "sleep" m1.locked?.should be_true m2.unlock library/mutex/synchronize_spec.rb @@ -17,7 +17,7 @@ describe "Mutex#try_lock" do m2.lock end - Thread.pass until th.status == "sleep" + Thread.pass while th.status and th.status != "sleep" # th owns m1 so try_lock should return false m1.try_lock.should be_false library/mutex/try_lock_spec.rb @@ -17,7 +17,7 @@ describe "Mutex#unlock" do end # avoid race on mutex.lock - Thread.pass until th.status == "sleep" + Thread.pass while th.status and th.status != "sleep" lambda { mutex.unlock }.should raise_error(ThreadError) library/mutex/unlock_spec.rb @@ -19,7 +19,7 @@ describe "BasicSocket#recv" do data = client.recv(10) client.close end - Thread.pass until t.status == "sleep" or t.status == nil + Thread.pass while t.status and t.status != "sleep" t.status.should_not be_nil socket = TCPSocket.new('127.0.0.1', SocketSpecs.port) @@ -37,7 +37,7 @@ describe "BasicSocket#recv" do data = client.recv(10) # in-band data (TCP), doesn't receive the flag. client.close end - Thread.pass until t.status == "sleep" or t.status == nil + Thread.pass while t.status and t.status != "sleep" t.status.should_not be_nil socket = TCPSocket.new('127.0.0.1', SocketSpecs.port) library/socket/basicsocket/recv_spec.rb @@ -22,7 +22,7 @@ describe "BasicSocket#send" do data = client.recv(5) client.close end - Thread.pass until t.status == "sleep" or t.status == nil + Thread.pass while t.status and t.status != "sleep" t.status.should_not be_nil @socket.send('hello', 0).should == 5 @@ -40,7 +40,7 @@ describe "BasicSocket#send" do data = client.recv(6) client.close end - Thread.pass until t.status == "sleep" or t.status == nil + Thread.pass while t.status and t.status != "sleep" t.status.should_not be_nil @socket.send('helloU', Socket::MSG_PEEK | Socket::MSG_OOB).should == 6 @@ -57,7 +57,7 @@ describe "BasicSocket#send" do data = client.recv(5) client.close end - Thread.pass until t.status == "sleep" or t.status == nil + Thread.pass while t.status and t.status != "sleep" t.status.should_not be_nil sockaddr = Socket.pack_sockaddr_in(SocketSpecs.port, "127.0.0.1") library/socket/basicsocket/send_spec.rb @@ -20,7 +20,7 @@ describe "TCPServer#accept" do client << "goodbye" client.close end - Thread.pass until t.status == "sleep" + Thread.pass while t.status and t.status != "sleep" socket = TCPSocket.new('127.0.0.1', SocketSpecs.port) socket.write('hello') @@ -33,7 +33,7 @@ describe "TCPServer#accept" do it "can be interrupted by Thread#kill" do t = Thread.new { @server.accept } - Thread.pass until t.status == "sleep" + Thread.pass while t.status and t.status != "sleep" # kill thread, ensure it dies in a reasonable amount of time t.kill @@ -49,7 +49,7 @@ describe "TCPServer#accept" do it "can be interrupted by Thread#raise" do t = Thread.new { @server.accept } - Thread.pass until t.status == "sleep" + Thread.pass while t.status and t.status != "sleep" # raise in thread, ensure the raise happens ex = Exception.new library/socket/tcpserver/accept_spec.rb @@ -19,7 +19,7 @@ describe :tcpsocket_new, :shared => true do server.accept server.close end - Thread.pass until thread.status == 'sleep' or thread.status == nil + Thread.pass while thread.status and thread.status != 'sleep' thread.status.should_not be_nil lambda { sock = TCPSocket.new(@hostname, SocketSpecs.port) @@ -34,7 +34,7 @@ describe :tcpsocket_new, :shared => true do server.accept server.close end - Thread.pass until thread.status == 'sleep' or thread.status == nil + Thread.pass while thread.status and thread.status != 'sleep' thread.status.should_not be_nil sock = TCPSocket.new('127.0.0.1', SocketSpecs.port) sock.addr[0].should == "AF_INET" library/socket/tcpsocket/shared/new.rb @@ -1,10 +1,11 @@ require File.dirname(__FILE__) + '/../../../spec_helper' require File.dirname(__FILE__) + '/../fixtures/classes' -describe "UNIXSocket#recvfrom" do +describe "UNIXServer#recvfrom" do platform_is_not :windows do before :each do + FileUtils.rm(SocketSpecs.socket_path, :force => true) @path = SocketSpecs.socket_path @server = UNIXServer.open(@path) library/socket/unixserver/accept_nonblock_spec.rb @@ -32,7 +32,7 @@ platform_is_not :windows do t = Thread.new { server.accept } - Thread.pass until t.status == "sleep" + Thread.pass while t.status and t.status != "sleep" # kill thread, ensure it dies in a reasonable amount of time t.kill @@ -51,7 +51,7 @@ platform_is_not :windows do t = Thread.new { server.accept } - Thread.pass until t.status == "sleep" + Thread.pass while t.status and t.status != "sleep" # raise in thread, ensure the raise happens ex = Exception.new library/socket/unixserver/accept_spec.rb e4a5124b63a93fb6181c5a87fa678a059d6c8d7a Brian Ford bford@engineyard.com http://github.com/rubyspec/rubyspec/commit/26b33df3b2440a2d4f3fee4a44f6df9de3fb8aab 26b33df3b2440a2d4f3fee4a44f6df9de3fb8aab 2009-04-27T21:20:08-07:00 2009-04-27T21:20:04-07:00 Fixed specs passing until a thread is asleep. According to ri Thread#status, the following values may be returned: "run" "aborting" "sleep" false nil where false is returned if a thread exits normally and nil if a thread exits with an exception. Thread#alive? returns true if a thread's status is "run" or "sleep". In the specs, to pass until a thread is asleep, the following is required: Thread.pass while t.status and t.status != 'sleep' If the thread exits normally or with exception before this code runs, it will not loop infinitely like it would if the following is used: Thread.pass until t.status == 'sleep' Note that the following is not a substitute for the proper way above: Thread.pass until t.status == 'sleep' || !t.alive? since t.alive? would return false for an aborting thread. 0e22d3f14b5a1942b2c214077c1b9fc1469ff74d Brian Ford bford@engineyard.com