Risk: Low
Visibilty: Verify/Repair don't work without it.
Update ssh_port and ssh_pass to use self. in def verify and def repair
Signed-off-by: Scott Zawalski <scottz@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1641 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/server/server_job.py b/server/server_job.py
index e143fd1..166846a 100755
--- a/server/server_job.py
+++ b/server/server_job.py
@@ -250,8 +250,9 @@
'No machines specified to verify')
try:
namespace = {'machines' : self.machines, 'job' : self, \
- 'ssh_user' : self.ssh_user, 'ssh_port' : ssh_port, \
- 'ssh_pass' : ssh_pass}
+ 'ssh_user' : self.ssh_user, \
+ 'ssh_port' : self.ssh_port, \
+ 'ssh_pass' : self.ssh_pass}
exec(preamble + verify, namespace, namespace)
except Exception, e:
msg = ('Verify failed\n' + str(e) + '\n'
@@ -265,8 +266,9 @@
raise error.AutoservError(
'No machines specified to repair')
namespace = {'machines' : self.machines, 'job' : self, \
- 'ssh_user' : self.ssh_user, 'ssh_port' : ssh_port, \
- 'ssh_pass' : ssh_pass}
+ 'ssh_user' : self.ssh_user, \
+ 'ssh_port' : self.ssh_port, \
+ 'ssh_pass' : self.ssh_pass}
# no matter what happens during repair, go on to try to reverify
try:
exec(preamble + repair, namespace, namespace)