make cross-check-tcp more robust : we need to wait for network presence on both ends...

[tests.git] / system / tcptest.py

diff --git a/system/tcptest.py b/system/tcptest.py
index bff3c66..f1512b6 100755 (executable)
--- a/system/tcptest.py
+++ b/system/tcptest.py
@@ -50,6 +50,7 @@ class Server:
             parser.print_help()
             sys.exit(1)
 
+        myprint("==================== tcptest.py server", id='server')
         show_network_status(id='server')
         server = SocketServer.TCPServer((options.address, options.port),
                                         UppercaseRequestHandler)
@@ -82,13 +83,21 @@ class Ready:
                           default=socket.gethostname(), help="address")
         (options, args) = parser.parse_args()
 
-        s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        try:
-            s.bind((options.address, options.port))
-            sys.exit(0)
-        except Exception as e:
-            print e
-            sys.exit(1)
+        myprint("==================== tcptest.py ready", id='ready')
+        def can_bind ():
+            s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            try:
+                s.bind((options.address, options.port))
+                return True
+            except Exception as e:
+                print e
+                return False
+
+        def eth0_has_ipv4():
+            command = "ip address show eth0 | grep -q ' inet '"
+            return subprocess.check_call(command, shell=True) == 0
+
+        sys.exit(0 if can_bind() and eth0_has_ipv4() else 1)
         
 class Client:
     """
@@ -110,6 +119,7 @@ class Client:
             parser.print_help()
             sys.exit(1)
 
+        myprint("==================== tcptest.py client", id='client')
         result=True
         for i in range(1,options.loops+1):
             s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)