Acceptance test result must be predictable

Signed-off-by: Alexandre Thibault <[email protected]>

Author: alexppxela

_test/Reflector.rb

@@ -68,7 +68,9 @@ def processLine(lineNum, line, body, cid)
       if body == "CONNECT"
         waitConnectAction(cid)
       elsif body == "DISCONNECT"
-        waitDisconnectAction(cid)
+        waitDisconnectAction(cid, false)
+      elsif body == "DISCONNECT_OR_ALREADY_DISCONNECTED"
+        waitDisconnectAction(cid, true)
       else
         raise "Syntax error: " + body
       end

_test/ReflectorClient.rb

@@ -66,12 +66,16 @@ def @reflector.disconnectAction(cid)
     def @reflector.waitConnectAction(cid)
     end
 
-    def @reflector.waitDisconnectAction(cid)
-      socket = @sockets[cid]
-      if IO.select([socket], nil, nil, 10) == nil then 
-	    raise "Connection hangs after ten seconds."
-      elsif !socket.eof? then
-	    raise "Expected disconnection, got data"
+    def @reflector.waitDisconnectAction(cid, canBeDisconnectedByPeer)
+      begin
+        socket = @sockets[cid]
+        if IO.select([socket], nil, nil, 10) == nil then
+        raise "Connection hangs after ten seconds."
+        elsif !socket.eof? then
+        raise "Expected disconnection, got data"
+        end
+      rescue Errno::ECONNRESET
+        raise unless canBeDisconnectedByPeer
       end
     end
 

_test/ReflectorServer.rb

@@ -57,16 +57,21 @@ def @reflector.waitConnectAction(cid)
 	@server.waitConnectAction
     end
 
-    def @reflector.waitDisconnectAction(cid)
-      if IO.select([@socket], nil, nil, 10) == nil then 
-	raise "Connection hangs after five seconds."
-      elsif !@socket.eof? then
-	raise "Expected disconnection, got data"
+    def @reflector.waitDisconnectAction(cid, canBeDisconnectedByPeer)
+      begin
+        if IO.select([@socket], nil, nil, 10) == nil then
+          raise "Connection hangs after five seconds."
+        elsif !@socket.eof? then
+          raise "Expected disconnection, got data"
+        end
+      rescue Errno::ECONNRESET => e
+        unless canBeDisconnectedByPeer
+          raise
+        end
       end
     end
 
   end
-
   def connectAction(s)
     if @socket == nil
       @socket = s

_test/ReflectorTestCase.rb

@@ -181,9 +181,14 @@ def reflector.waitConnectAction(cid)
       @econ += cid.to_s + "," + "eCONNECT" + "|"
     end
 
-    def reflector.waitDisconnectAction(cid)
-      @cum += cid.to_s + "," + "eDISCONNECT" + "|"
-      @edis += cid.to_s + "," + "eDISCONNECT" + "|"
+    def reflector.waitDisconnectAction(cid, canBeDisconnectedByPeer)
+      if canBeDisconnectedByPeer then
+        @cum += cid.to_s + "," + "eDISCONNECT_OR_ALREADY_DISCONNECTED" + "|"
+        @edis += cid.to_s + "," + "eDISCONNECT_OR_ALREADY_DISCONNECTED" + "|"
+      else
+        @cum += cid.to_s + "," + "eDISCONNECT" + "|"
+        @edis += cid.to_s + "," + "eDISCONNECT" + "|"
+      end
     end
 
     def reflector.errorAction(lineNum, msg)

_test/definitions/server/fix50sp2/2f_PossDupOrigSendingTimeTooHigh.def

@@ -19,4 +19,4 @@ E8=FIXT.1.1
9=99
35=3
34=4
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=Sendin
 # logout message
 E8=FIXT.1.1
9=49
35=5
34=5
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 I8=FIXT.1.1
35=5
34=4
49=TW
52=<TIME>
56=ISLD

-eDISCONNECT
+eDISCONNECT_OR_ALREADY_DISCONNECTED

_test/definitions/server/fix50sp2/2i_BeginStringValueUnexpected.def

@@ -8,7 +8,7 @@ E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
11
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

 E8=FIXT.1.1
9=74
35=5
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
58=Incorrect BeginString
10=0

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

-eDISCONNECT
+eDISCONNECT_OR_ALREADY_DISCONNECTED
 
 iCONNECT
 I8=FIXT.1.1
35=A
34=1
49=TW
52=<TIME>
56=ISLD
98=0
108=30
1137=9

@@ -17,4 +17,4 @@ E8=FIXT.1.1
9=68
35=A
34=1
49=ISLD
52=00000000-00:00:00.000
56=TW
98=0
108=30
11
 # Send with incorrect begin string and don't respond to logout
 I8=FIX.4.1
35=1
34=2
49=TW
52=<TIME>
56=ISLD
112=id

 E8=FIXT.1.1
9=74
35=5
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
58=Incorrect BeginString
10=0

-eDISCONNECT
+eDISCONNECT_OR_ALREADY_DISCONNECTED

_test/definitions/server/fix50sp2/2k_CompIDDoesNotMatchProfile.def

@@ -12,7 +12,7 @@ E8=FIXT.1.1
9=84
35=3
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=CompID
 # logout message
 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

-eDISCONNECT
+eDISCONNECT_OR_ALREADY_DISCONNECTED
 
 # TargetCompID is invalid
 
@@ -28,7 +28,7 @@ E8=FIXT.1.1
9=84
35=3
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=CompID
 # logout message
 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

-eDISCONNECT
+eDISCONNECT_OR_ALREADY_DISCONNECTED
 
 # SenderCompID and TargetCompID is invalid
 
@@ -44,4 +44,4 @@ E8=FIXT.1.1
9=84
35=3
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=CompID
 # logout message
 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

-eDISCONNECT
+eDISCONNECT_OR_ALREADY_DISCONNECTED

_test/definitions/server/fix50sp2/2o_SendingTimeValueOutOfRange.def

@@ -11,7 +11,7 @@ I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME-121>
56=ISLD

 E8=FIXT.1.1
9=99
35=3
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=SendingTime accuracy problem
372=0
373=10
10=0

 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

-eDISCONNECT
+eDISCONNECT_OR_ALREADY_DISCONNECTED
 
 # SendingTime is too large, reject
 
@@ -26,4 +26,4 @@ I8=FIXT.1.1
35=0
34=2
49=TW
52=<TIME+121>
56=ISLD

 E8=FIXT.1.1
9=99
35=3
34=2
49=ISLD
52=00000000-00:00:00.000
56=TW
45=2
58=SendingTime accuracy problem
372=0
373=10
10=0

 E8=FIXT.1.1
9=49
35=5
34=3
49=ISLD
52=00000000-00:00:00.000
56=TW
10=0

 I8=FIXT.1.1
35=5
34=3
49=TW
52=<TIME>
56=ISLD

-eDISCONNECT
+eDISCONNECT_OR_ALREADY_DISCONNECTED