git://git.onelab.eu
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
one layer of polish
[tests.git]
/
system
/
tcptest.py
diff --git
a/system/tcptest.py
b/system/tcptest.py
index
f1512b6
..
773ecbe
100755
(executable)
--- a/
system/tcptest.py
+++ b/
system/tcptest.py
@@
-12,8
+12,8
@@
import threading
from optparse import OptionParser
def myprint(message, id='client'):
from optparse import OptionParser
def myprint(message, id='client'):
- now
=
time.strftime("%H:%M:%S", time.localtime())
- print "*
",now,'(%s)' % id, '--',message
+ now
=
time.strftime("%H:%M:%S", time.localtime())
+ print "*
{now} ({id}) -- {message}".format(**locals())
sys.stdout.flush()
def show_network_status(id):
sys.stdout.flush()
def show_network_status(id):
@@
-127,15
+127,15
@@
class Client:
mout=i*'ping ' + '\n'
min=mout.upper()
if s.send(mout) != len(mout):
mout=i*'ping ' + '\n'
min=mout.upper()
if s.send(mout) != len(mout):
- myprint("cannot send
%s"%mout.strip(
))
+ myprint("cannot send
{}".format(mout.strip()
))
result=False
break
line=s.recv(len(min))
if line is not line:
result=False
break
line=s.recv(len(min))
if line is not line:
- myprint("unexpected reception\ngot:
%s\nexpected: %s",line,min
)
- result
=
False
+ myprint("unexpected reception\ngot:
{}\nexpected: {}".format(line, min)
)
+ result
=
False
else:
else:
- myprint("OK:
%s"%mout.strip(
))
+ myprint("OK:
{}".format(mout.strip()
))
# leave the connection open, but the last one (so 1 iter returns fast)
if i != options.loops:
time.sleep(options.sleep)
# leave the connection open, but the last one (so 1 iter returns fast)
if i != options.loops:
time.sleep(options.sleep)