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
Clean up of repo
[nepi.git]
/
src
/
nepi
/
testbeds
/
planetlab
/
node.py
diff --git
a/src/nepi/testbeds/planetlab/node.py
b/src/nepi/testbeds/planetlab/node.py
index
a924e12
..
a73f6ab
100644
(file)
--- a/
src/nepi/testbeds/planetlab/node.py
+++ b/
src/nepi/testbeds/planetlab/node.py
@@
-619,9
+619,7
@@
class Node(object):
for cmd in cmds:
(out,err),proc = server.popen_ssh_command(
# Some apps need two kills
for cmd in cmds:
(out,err),proc = server.popen_ssh_command(
# Some apps need two kills
- cmd % {
- 'slicename' : self.slicename ,
- },
+ cmd,
host = self.hostip,
port = None,
user = self.slicename,
host = self.hostip,
port = None,
user = self.slicename,
@@
-820,8
+818,9
@@
class Node(object):
def check_bad_host(self, out, err):
badre = re.compile(r'(?:'
def check_bad_host(self, out, err):
badre = re.compile(r'(?:'
- r"curl: [(]\d+[)] Couldn't resolve host 'download1[.]rpmfusion[.]org'"
+
#
r"curl: [(]\d+[)] Couldn't resolve host 'download1[.]rpmfusion[.]org'"
r'|Error: disk I/O error'
r')',
re.I)
return badre.search(out) or badre.search(err)
r'|Error: disk I/O error'
r')',
re.I)
return badre.search(out) or badre.search(err)
+