Skip to content
This repository has been archived by the owner on Jun 11, 2019. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
bug 686748 - catch devicemanager exceptions in sut_tools scripts. r=bear
--HG--
branch : production-0.8
extra : rebase_source : b5e9f5542d4066a71f8a87bb7bae344f26dbf76b
  • Loading branch information
escapewindow committed Sep 16, 2011
1 parent 4a2f360 commit e0508eb
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions process/factory.py
Expand Up @@ -6882,13 +6882,13 @@ def addRunTestSteps(self):

def addTearDownSteps(self):
self.addCleanupSteps()
self.addStep(DisconnectStep(
self.addStep(ShellCommand(
name='reboot device',
workdir='.',
alwaysRun=True,
force_disconnect=True,
warnOnFailure=False,
flunkOnFailure=False,
timeout=60*30,
description='Reboot Device',
command=['python', '/builds/sut_tools/reboot.py',
WithProperties("%(sut_ip)s"),
Expand Down Expand Up @@ -7440,17 +7440,17 @@ def do_disconnect(cmd):
pass
return False
if self.remoteTests:
self.addStep(DisconnectStep(
self.addStep(ShellCommand(
name='reboot device',
flunkOnFailure=True,
flunkOnFailure=False,
warnOnFailure=False,
alwaysRun=True,
workdir=self.workdirBase,
description="Reboot Device",
timeout=60*30,
command=['python', '/builds/sut_tools/reboot.py',
WithProperties("%(sut_ip)s"),
],
force_disconnect=do_disconnect,
env=self.env)
)
else:
Expand Down

0 comments on commit e0508eb

Please sign in to comment.