Skip to content

Fix the false alarm of checking reboot result #2096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wangxin merged 1 commit into from
Aug 14, 2020
Merged

Fix the false alarm of checking reboot result #2096

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/common/reboot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ def execute_reboot_helper():
timeout=timeout,
module_ignore_errors=True)

if 'failed' in res or ('msg' in res and 'Timeout' in res['msg']):
if res.is_failed or ('msg' in res and 'Timeout' in res['msg']):
if reboot_res.ready():
logger.error('reboot result: {}'.format(reboot_res.get()))
raise Exception('DUT did not shutdown')
Expand All @@ -131,7 +131,7 @@ def execute_reboot_helper():
delay=delay,
timeout=timeout,
module_ignore_errors=True)
if 'failed' in res or ('msg' in res and 'Timeout' in res['msg']):
if res.is_failed or ('msg' in res and 'Timeout' in res['msg']):
raise Exception('DUT did not startup')

logger.info('ssh has started up')
Expand Down