Merge remote-tracking branch 'origin/master' into wdoor-stable

[shogi-server/shogi-server.git] / test / baseclient.rb

diff --git a/test/baseclient.rb b/test/baseclient.rb
index 39ad817..f6d7487 100644 (file)
--- a/test/baseclient.rb
+++ b/test/baseclient.rb
@@ -35,21 +35,25 @@ class SocketPlayer
 
   def reader
     @thread = Thread.new do
-      Thread.pass
-      loop do 
-#        break if @socket.closed?
-        if r = select([@socket], nil, nil, 10)
-          str = r[0].first.gets
-          break if str.nil?
-          @mutex.synchronize do
-            if %r!^[\+\-]\d{4}\w{2},T\d+$! =~ str
-                @received_moves += 1
+      begin
+        Thread.pass
+        loop do 
+          break if @socket.closed?
+          if r = select([@socket], nil, nil, 10)
+            str = r[0].first.gets
+            break if str.nil?
+            @mutex.synchronize do
+              if %r!^[\+\-]\d{4}\w{2},T\d+$! =~ str
+                  @received_moves += 1
+              end
+              @message << str
             end
-            @message << str
+          else
+            raise "timed out"
           end
-        else
-          raise "timed out"
         end
+      rescue IOError
+        $stderr.puts "\nReader thread interrupted"
       end
     end
   end
@@ -123,8 +127,8 @@ class SocketPlayer
   end
 
   def logout
-    stop_reader
     @socket.puts "LOGOUT"
+    @socket.close
   end
 
 end
@@ -178,20 +182,32 @@ class BaseClient < Test::Unit::TestCase
   end
 
   def login
+    sleep 0.1
     @p1.connect
+    sleep 0.1
     @p2.connect
+    sleep 0.1
     @p1.login
+    sleep 0.1
     @p2.login
+    sleep 0.5
     @p1.game
+    sleep 0.1
     @p2.game
+    sleep 0.1
     @p1.wait_game
+    sleep 0.1
     @p2.wait_game
   end
 
   def agree
+    sleep 0.1
     @p1.agree
+    sleep 0.1
     @p2.agree
+    sleep 0.1
     @p1.wait_agree
+    sleep 0.1
     @p2.wait_agree
   end