Backported 87d145bd1f1a14a33f5f6fbc78b63a1952f1ca90 and 2df8c798aeb7f0e77735e893fd137...

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

diff --git a/test/TC_jishogi_kachi.rb b/test/TC_jishogi_kachi.rb
index 38f9b49..824cafc 100644 (file)
--- a/test/TC_jishogi_kachi.rb
+++ b/test/TC_jishogi_kachi.rb
@@ -5,14 +5,10 @@ class JishogiTest < ReadFileClient
   def test_jishogi_kachi
     csa = File.open(filepath("jishogi_kachi.csa")) {|f| f.read}
     handshake(csa)
-    cmd2 "%KACHI"
-    sleep 1
-    result1 = cmd ""
-    result2 = cmd2 ""
-    result1 += read_nonblock(@socket1)
-    result2 += read_nonblock(@socket2)
+    @p2.puts "%KACHI"
+    @p1.wait(/#JISHOGI\n#LOSE/)
+    @p2.wait(/#JISHOGI\n#WIN/)
+    assert true
     logout12
-    assert_match(/#JISHOGI.#LOSE/m, result1)
-    assert_match(/#JISHOGI.#WIN/m, result2)
   end
 end # Client class