Move away from timeout

This commit changes the polling approach to a check against the list of
supported test cases - if a match is not found with the currently
available data, the service waits for more.

Signed-off-by: Ionut Mihalcea <[email protected]>

Author: ionut-arm

parsec_mock/parsec_mock.py

@@ -4,7 +4,6 @@
 
 import socket
 import os
-import sys
 from os import listdir
 from os.path import isfile, join
 
@@ -42,30 +41,41 @@ def run_test(test_folder, parsec_socket):
     sock.listen(1)
 
     while True:
+        print("Waiting for connections", flush=True)
         connection, client_addr = sock.accept()
         try:
+            print("Connection received from {}".format(client_addr), flush=True)
+            # Optionally reduce the default connection timeout
+            # connection.settimeout(10)
             received_data = connection.recv(4096)
-            all_received_data = received_data
-            # Keep polling the connection until there's no more to read
-            # for 0.5s.
-            connection.settimeout(0.5)
-            while True:
-                try:
-                    received_data = connection.recv(4096)
-                    all_received_data += received_data
-                except socket.timeout:
-                    print("Finished reading from socket")
+            all_received_data = bytearray()
+            # Read the socket in cycle until we either
+            # - receive a correct command or
+            # - fail to receive any data
+            while received_data:
+                all_received_data += received_data
+                b64_received_data = base64.b64encode(all_received_data).decode("ascii")
+                if b64_received_data in test_cases:
+                    (name, test_case) = test_cases[b64_received_data]
+                    print(
+                        "Received expected request for test case {}".format(name),
+                        flush=True,
+                    )
+                    bin_response = base64.b64decode(test_case.test_data.response)
+                    connection.sendall(bin_response)
                     break
-            b64_received_data = base64.b64encode(all_received_data).decode("ascii")
-            if b64_received_data in test_cases:
-                (name, test_case) = test_cases[b64_received_data]
-                print("Received expected request for test case {}".format(name))
-                bin_response = base64.b64decode(test_case.test_data.response)
-                connection.sendall(bin_response)
-            else:
-                print("Received unexpected request {}".format(b64_received_data))
+
+                print(
+                    "Received unexpected request {}".format(b64_received_data),
+                    flush=True,
+                )
+                print("Continue receiving", flush=True)
+                received_data = connection.recv(4096)
+
+            if not received_data:
+                print("No correct command received. No more data to read", flush=True)
         finally:
-            sys.stdout.flush()
+            print("Closing connection", flush=True)
             connection.close()