Improved stability of test results.

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

diff --git a/test/TC_oute_sennichite.rb b/test/TC_oute_sennichite.rb
index 2938047..926ef78 100644 (file)
--- a/test/TC_oute_sennichite.rb
+++ b/test/TC_oute_sennichite.rb
@@ -5,37 +5,28 @@ class OuteSennichiteTest < ReadFileClient
   def test_oute_sennichite
     csa = File.open(filepath("oute_sennichite.csa")) {|f| f.read}
     handshake(csa)
-    #cmd2 "%KACHI"
-    sleep 1
-    result1 = read_nonblock(@socket1)
-    result2 = read_nonblock(@socket2)
+    @p1.wait(/#OUTE_SENNICHITE.#LOSE/m)
+    @p2.wait(/#OUTE_SENNICHITE.#WIN/m)
+    assert true
     logout12
-    assert_match(/#OUTE_SENNICHITE.#LOSE/m, result1)
-    assert_match(/#OUTE_SENNICHITE.#WIN/m, result2)
   end
 
   def test_oute_sennichite2
     csa = File.open(filepath("oute_sennichite2.csa")) {|f| f.read}
     handshake(csa)
-    #cmd2 "%KACHI"
-    sleep 1
-    result1 = read_nonblock(@socket1)
-    result2 = read_nonblock(@socket2)
+    @p1.wait(/#OUTE_SENNICHITE.#WIN/m)
+    @p2.wait(/#OUTE_SENNICHITE.#LOSE/m)
+    assert true
     logout12
-    assert_match(/#OUTE_SENNICHITE.#WIN/m, result1)
-    assert_match(/#OUTE_SENNICHITE.#LOSE/m, result2)
   end
 
   def test_oute_sennichite3
     csa = File.open(filepath("oute_sennichite3.csa")) {|f| f.read}
     handshake(csa)
-    #cmd2 "%KACHI"
-    sleep 1
-    result1 = read_nonblock(@socket1)
-    result2 = read_nonblock(@socket2)
+    @p1.wait(/#OUTE_SENNICHITE.#LOSE/m)
+    @p2.wait(/#OUTE_SENNICHITE.#WIN/m)
+    assert true
     logout12
-    assert_match(/#OUTE_SENNICHITE.#LOSE/m, result1)
-    assert_match(/#OUTE_SENNICHITE.#WIN/m, result2)
   end
 end # Client class