summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTyler <tyler.baker@linaro.org>2014-10-03 04:09:31 (GMT)
committerTyler <tyler.baker@linaro.org>2014-10-03 04:16:48 (GMT)
commit86e2758227ebf1c0dc840eef997a9b2af93fbe76 (patch)
tree474c76fc555b5c0f12d0191fb8bef6dbd8ae8974
parent95d232c2c61ee727b69f6e2012a77883ab2d6d63 (diff)
downloadlava-dispatcher-86e2758227ebf1c0dc840eef997a9b2af93fbe76.tar.gz
lava-dispatcher-86e2758227ebf1c0dc840eef997a9b2af93fbe76.tar.xz
explictly use timeout variable
Change-Id: I57937b0582567cd4b2ea976845a38e8ec66bdec6
-rw-r--r--lava_dispatcher/device/bootloader.py3
-rw-r--r--lava_dispatcher/device/ipmi_tftp.py3
-rw-r--r--lava_dispatcher/device/jtag_drivers.py6
-rw-r--r--lava_dispatcher/device/master.py3
-rw-r--r--lava_dispatcher/device/target.py2
5 files changed, 11 insertions, 6 deletions
diff --git a/lava_dispatcher/device/bootloader.py b/lava_dispatcher/device/bootloader.py
index 9b0d241..b1b21a4 100644
--- a/lava_dispatcher/device/bootloader.py
+++ b/lava_dispatcher/device/bootloader.py
@@ -313,7 +313,8 @@ class BootloaderTarget(MasterImageTarget):
self.proc.sendline(self.config.pre_boot_cmd,
send_char=self.config.send_char)
self._customize_bootloader(self.proc, boot_cmds)
- self.proc.expect(self.config.image_boot_msg, self.config.image_boot_msg_timeout)
+ self.proc.expect(self.config.image_boot_msg,
+ timeout=self.config.image_boot_msg_timeout)
self._auto_login(self.proc)
self._wait_for_prompt(self.proc, self.config.test_image_prompts,
self.config.boot_linaro_timeout)
diff --git a/lava_dispatcher/device/ipmi_tftp.py b/lava_dispatcher/device/ipmi_tftp.py
index e2c95fc..8e7db13 100644
--- a/lava_dispatcher/device/ipmi_tftp.py
+++ b/lava_dispatcher/device/ipmi_tftp.py
@@ -183,7 +183,8 @@ class IpmiPxeTarget(Target):
self._enter_bootloader(self.proc)
boot_cmds = self._load_boot_cmds(default='boot_cmds_master')
self._customize_bootloader(self.proc, boot_cmds)
- self.proc.expect(self.config.image_boot_msg, self.config.image_boot_msg_timeout)
+ self.proc.expect(self.config.image_boot_msg,
+ timeout=self.config.image_boot_msg_timeout)
self._wait_for_prompt(self.proc, self.config.test_image_prompts,
self.config.boot_linaro_timeout)
self.proc.sendline('export PS1="%s"' % self.MASTER_PS1)
diff --git a/lava_dispatcher/device/jtag_drivers.py b/lava_dispatcher/device/jtag_drivers.py
index 22ed8c9..cf3a11f 100644
--- a/lava_dispatcher/device/jtag_drivers.py
+++ b/lava_dispatcher/device/jtag_drivers.py
@@ -175,7 +175,8 @@ class stmc(BaseDriver):
# Ask the master to deliver the image
self.context.transport.request_send('lava_ms_boot', None)
- proc.expect(self.config.image_boot_msg, self.config.image_boot_msg_timeout)
+ proc.expect(self.config.image_boot_msg,
+ timeout=self.config.image_boot_msg_timeout)
return proc
else:
boot_cmds.insert(0, self._stmc_command)
@@ -225,5 +226,6 @@ class stmc(BaseDriver):
logging.info("Delivering images with STMC")
self.context.run_command(jtag_command, failok=False)
- proc.expect(self.config.image_boot_msg, self.config.image_boot_msg_timeout)
+ proc.expect(self.config.image_boot_msg,
+ timeout=self.config.image_boot_msg_timeout)
return proc
diff --git a/lava_dispatcher/device/master.py b/lava_dispatcher/device/master.py
index 975f54d..8d8c3de 100644
--- a/lava_dispatcher/device/master.py
+++ b/lava_dispatcher/device/master.py
@@ -419,7 +419,8 @@ class MasterImageTarget(Target):
boot_cmds = self._load_boot_cmds(default='boot_cmds_master',
boot_tags=self.master_boot_tags)
self._customize_bootloader(self.proc, boot_cmds)
- self.proc.expect(self.config.image_boot_msg, self.config.image_boot_msg_timeout)
+ self.proc.expect(self.config.image_boot_msg,
+ timeout=self.config.image_boot_msg_timeout)
self._auto_login(self.proc, is_master=True)
self._wait_for_prompt(self.proc, self.config.master_str, timeout=300)
diff --git a/lava_dispatcher/device/target.py b/lava_dispatcher/device/target.py
index 00ec1af..f4bd36d 100644
--- a/lava_dispatcher/device/target.py
+++ b/lava_dispatcher/device/target.py
@@ -468,7 +468,7 @@ class Target(object):
def _enter_bootloader(self, connection):
if connection.expect(self.config.interrupt_boot_prompt,
- self.config.bootloader_timeout) != 0:
+ timeout=self.config.bootloader_timeout) != 0:
raise Exception("Failed to enter bootloader")
if self.config.interrupt_boot_control_character:
connection.sendcontrol(self.config.interrupt_boot_control_character)