From 94c2b367ed93481899be3bcd41e56cc3f37d309e Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 3 Mar 2015 14:51:04 +0100
Subject: [PATCH] improve the output of tcp{server,client} make sure this can
 be used next time this step fails

---
 system/tcptest.py | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/system/tcptest.py b/system/tcptest.py
index a8a860e..dd2bc25 100755
--- a/system/tcptest.py
+++ b/system/tcptest.py
@@ -5,18 +5,21 @@
 #
 import sys
 import time
-from optparse import OptionParser    
+import subprocess
 import socket
 import SocketServer
+from optparse import OptionParser    
 
-def myprint(message):
+def myprint(message, is_client=True):
     now=time.strftime("%H:%M:%S", time.localtime())
-    print "*",now,'--',message
+    id = 'tcpclient' if is_client else 'tcpserver'
+    print "*",now,'(%s)' % id, '--',message
+    sys.stdout.flush()
 
-def show_network_status():
-    print "ip address show"
+def show_network_status(is_client):
+    myprint("ip address show", is_client=is_client)
     subprocess.call(['ip','address','show'])
-    print "ip route show"
+    myprint("ip route show", is_client=is_client)
     subprocess.call(['ip','route','show'])
 
 class EchoRequestHandler(SocketServer.StreamRequestHandler):
@@ -34,12 +37,12 @@ class Server:
     def main(self):
         import threading
 
-        parser=OptionParser()
-        parser.add_option("-p","--port", action="store", dest="port", type="int",
+        parser = OptionParser()
+        parser.add_option("-p", "--port", action="store", dest="port", type="int",
                           default=10000, help="port number")
-        parser.add_option("-a","--address", action="store", dest="address", 
+        parser.add_option("-a", "--address", action="store", dest="address", 
                           default=socket.gethostname(), help="address")
-        parser.add_option("-t","--timeout", action="store", dest="timeout", type="int",
+        parser.add_option("-t", "--timeout", action="store", dest="timeout", type="int",
                           default="0")
         
         (options, args) = parser.parse_args()
@@ -47,7 +50,7 @@ class Server:
             parser.print_help()
             sys.exit(1)
 
-        show_network_status()
+        show_network_status(is_client=False)
 
         server = SocketServer.TCPServer((options.address, options.port),
                                         UppercaseRequestHandler)
@@ -67,9 +70,7 @@ class Server:
             
 class Client:
     def main(self):
-        from optparse import OptionParser    
-
-        parser=OptionParser()
+        parser = OptionParser()
         parser.add_option("-p","--port", action="store", dest="port", type="int",
                           default=10000, help="port number")
         parser.add_option("-a","--address", action="store", dest="address", 
@@ -107,7 +108,8 @@ class Client:
             s.close()
         myprint("Done")
         exit_return=0
-        if not result: exit_return=1
+        if not result:
+            exit_return=1
         sys.exit(exit_return)
 
 if __name__ == '__main__':
-- 
2.43.0