git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
replacing assertEquals into assertEqual
[nepi.git]
/
test
/
util
/
sshfuncs.py
diff --git
a/test/util/sshfuncs.py
b/test/util/sshfuncs.py
index
75e5464
..
ba738b1
100755
(executable)
--- a/
test/util/sshfuncs.py
+++ b/
test/util/sshfuncs.py
@@
-4,9
+4,8
@@
# Copyright (C) 2013 INRIA
#
# This program is free software: you can redistribute it and/or modify
# Copyright (C) 2013 INRIA
#
# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation;
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-48,7
+47,7
@@
def find_bin(name, extra_path = None):
try:
os.stat(d + "/" + name)
return d + "/" + name
try:
os.stat(d + "/" + name)
return d + "/" + name
- except OSError
,
e:
+ except OSError
as
e:
if e.errno != os.errno.ENOENT:
raise
return None
if e.errno != os.errno.ENOENT:
raise
return None
@@
-69,9
+68,8
@@
def gen_ssh_keypair(filename):
def add_key_to_agent(filename):
ssh_add = find_bin_or_die("ssh-add")
args = [ssh_add, filename]
def add_key_to_agent(filename):
ssh_add = find_bin_or_die("ssh-add")
args = [ssh_add, filename]
- null = file("/dev/null", "w")
- assert subprocess.Popen(args, stderr = null).wait() == 0
- null.close()
+ with open("/dev/null", "w") as null:
+ assert subprocess.Popen(args, stderr = null).wait() == 0
def get_free_port():
s = socket.socket()
def get_free_port():
s = socket.socket()
@@
-94,10
+92,9
@@
PermitUserEnvironment yes
"""
def gen_sshd_config(filename, port, server_key, auth_keys):
"""
def gen_sshd_config(filename, port, server_key, auth_keys):
- conf = open(filename, "w")
- text = _SSH_CONF % (port, server_key, auth_keys)
- conf.write(text)
- conf.close()
+ with open(filename, "w") as conf:
+ text = _SSH_CONF % (port, server_key, auth_keys)
+ conf.write(text)
return filename
def gen_auth_keys(pubkey, output, environ):
return filename
def gen_auth_keys(pubkey, output, environ):
@@
-106,11
+103,11
@@
def gen_auth_keys(pubkey, output, environ):
for k, v in environ.items():
opts.append('environment="%s=%s"' % (k, v))
for k, v in environ.items():
opts.append('environment="%s=%s"' % (k, v))
- lines = file(pubkey).readlines()
+ with open(pubkey) as f:
+ lines = f.readlines()
pubkey = lines[0].split()[0:2]
pubkey = lines[0].split()[0:2]
- out = file(output, "w")
- out.write("%s %s %s\n" % (",".join(opts), pubkey[0], pubkey[1]))
- out.close()
+ with open(output, "w") as out:
+ out.write("%s %s %s\n" % (",".join(opts), pubkey[0], pubkey[1]))
return output
def start_ssh_agent():
return output
def start_ssh_agent():
@@
-132,9
+129,8
@@
def stop_ssh_agent(data):
# No need to gather the pid, ssh-agent knows how to kill itself; after we
# had set up the environment
ssh_agent = find_bin_or_die("ssh-agent")
# No need to gather the pid, ssh-agent knows how to kill itself; after we
# had set up the environment
ssh_agent = find_bin_or_die("ssh-agent")
- null = file("/dev/null", "w")
- proc = subprocess.Popen([ssh_agent, "-k"], stdout = null)
- null.close()
+ with open("/dev/null", "w") as null:
+ proc = subprocess.Popen([ssh_agent, "-k"], stdout = null)
assert proc.wait() == 0
for k in data:
del os.environ[k]
assert proc.wait() == 0
for k in data:
del os.environ[k]
@@
-182,7
+178,7
@@
class SSHfuncsTestCase(unittest.TestCase):
(outremote, errrmote), premote = rexec(command, host, user,
port = env.port, agent = True)
(outremote, errrmote), premote = rexec(command, host, user,
port = env.port, agent = True)
- self.assertEqual
s
(outlocal, outremote)
+ self.assertEqual(outlocal, outremote)
def test_rcopy_list(self):
env = test_environment()
def test_rcopy_list(self):
env = test_environment()
@@
-208,14
+204,14
@@
class SSHfuncsTestCase(unittest.TestCase):
files.extend(names)
os.path.walk(destdir, recls, files)
files.extend(names)
os.path.walk(destdir, recls, files)
- origfiles =
map(lambda s: os.path.basename(s), [dirpath, f.name, f1.name])
+ origfiles =
[os.path.basename(s) for s in [dirpath, f.name, f1.name]]
- self.assertEqual
s
(sorted(origfiles), sorted(files))
+ self.assertEqual(sorted(origfiles), sorted(files))
os.remove(f1.name)
shutil.rmtree(dirpath)
os.remove(f1.name)
shutil.rmtree(dirpath)
- def test_rcopy_
s
list(self):
+ def test_rcopy_list(self):
env = test_environment()
user = getpass.getuser()
host = "localhost"
env = test_environment()
user = getpass.getuser()
host = "localhost"
@@
-229,19
+225,20
@@
class SSHfuncsTestCase(unittest.TestCase):
f1.close()
f1.name
f1.close()
f1.name
- source = "%s;%s" % (dirpath, f1.name)
+ # Copy a list of files
+ source = [dirpath, f1.name]
destdir = tempfile.mkdtemp()
dest = "%s@%s:%s" % (user, host, destdir)
destdir = tempfile.mkdtemp()
dest = "%s@%s:%s" % (user, host, destdir)
- rcopy(source, dest, port = env.port, agent = True, recursive = True)
+
((out, err), proc) =
rcopy(source, dest, port = env.port, agent = True, recursive = True)
files = []
def recls(files, dirname, names):
files.extend(names)
os.path.walk(destdir, recls, files)
files = []
def recls(files, dirname, names):
files.extend(names)
os.path.walk(destdir, recls, files)
-
- origfiles =
map(lambda s: os.path.basename(s), [dirpath, f.name, f1.name])
+
+ origfiles =
[os.path.basename(s) for s in [dirpath, f.name, f1.name]]
- self.assertEqual
s
(sorted(origfiles), sorted(files))
+ self.assertEqual(sorted(origfiles), sorted(files))
def test_rproc_manage(self):
env = test_environment()
def test_rproc_manage(self):
env = test_environment()
@@
-274,7
+271,7
@@
class SSHfuncsTestCase(unittest.TestCase):
port = env.port,
agent = True)
port = env.port,
agent = True)
- self.assertEqual
s
(status, ProcStatus.RUNNING)
+ self.assertEqual(status, ProcStatus.RUNNING)
rkill(pid, ppid,
host = host,
rkill(pid, ppid,
host = host,
@@
-288,7
+285,7
@@
class SSHfuncsTestCase(unittest.TestCase):
port = env.port,
agent = True)
port = env.port,
agent = True)
- self.assertEqual
s
(status, ProcStatus.FINISHED)
+ self.assertEqual(status, ProcStatus.FINISHED)
if __name__ == '__main__':
if __name__ == '__main__':