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
no more lxc-enter-namespace - use ssh
[tests.git]
/
system
/
tcptest.py
diff --git
a/system/tcptest.py
b/system/tcptest.py
index
f1512b6
..
abdc6fb
100755
(executable)
--- a/
system/tcptest.py
+++ b/
system/tcptest.py
@@
-3,6
+3,14
@@
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
# Copyright (C) 2010 INRIA
#
# Thierry Parmentelat <thierry.parmentelat@inria.fr>
# Copyright (C) 2010 INRIA
#
+
+# this is a small and simple standalone utility
+# designed to run in slice-space
+# we keep this in python2 for now until python3
+# can be taken for granted in sliceimage
+
+from __future__ import print_function
+
import sys
import time
import subprocess
import sys
import time
import subprocess
@@
-12,8
+20,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):
@@
-64,7
+72,7
@@
class Server:
else:
server.serve_forever()
except KeyboardInterrupt as e:
else:
server.serve_forever()
except KeyboardInterrupt as e:
- print
'Bailing out on keyboard interrupt'
+ print
('Bailing out on keyboard interrupt')
sys.exit(1)
class Ready:
sys.exit(1)
class Ready:
@@
-90,7
+98,7
@@
class Ready:
s.bind((options.address, options.port))
return True
except Exception as e:
s.bind((options.address, options.port))
return True
except Exception as e:
- print
e
+ print
(e)
return False
def eth0_has_ipv4():
return False
def eth0_has_ipv4():
@@
-127,15
+135,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)
@@
-158,5
+166,5
@@
if __name__ == '__main__':
elif arg.find("ready") >= 0:
sys.argv.remove(arg)
Ready().main()
elif arg.find("ready") >= 0:
sys.argv.remove(arg)
Ready().main()
- print
'you must specify either --client or --server'
+ print
('you must specify either --client or --server')
sys.exit(1)
sys.exit(1)