github/open-cas-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #502 from katlapinka/reboot-prepare

Browse Source 
Add reboot if executor can not connect to DUT in test prepare
This commit is contained in:
Robert Baldyga 2020-08-21 10:40:08 +02:00 committed by GitHub
commit a769b9fe0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/functional/tests/conftest.py
View File

@ -5,6 +5,7 @@
import os import os
import sys import sys
from datetime import timedelta
import pytest import pytest
import yaml import yaml
@ -47,7 +48,7 @@ def pytest_runtest_setup(item):
raise Exception("You need to specify DUT config. See the example_dut_config.py file.") raise Exception("You need to specify DUT config. See the example_dut_config.py file.")
dut_config['plugins_dir'] = os.path.join(os.path.dirname(__file__), "../lib") dut_config['plugins_dir'] = os.path.join(os.path.dirname(__file__), "../lib")
dut_config['opt_plugins'] = {"test_wrapper": {}, "serial_log": {}} dut_config['opt_plugins'] = {"test_wrapper": {}, "serial_log": {}, "power_control": {}}
try: try:
TestRun.prepare(item, dut_config) TestRun.prepare(item, dut_config)
@ -55,6 +56,15 @@ def pytest_runtest_setup(item):
test_name = item.name.split('[')[0] test_name = item.name.split('[')[0]
TestRun.LOGGER = create_log(item.config.getoption('--log-path'), test_name) TestRun.LOGGER = create_log(item.config.getoption('--log-path'), test_name)
TestRun.presetup()
try:
TestRun.executor.wait_for_connection(timedelta(seconds=20))
except Exception:
try:
TestRun.plugin_manager.get_plugin('power_control').power_cycle()
TestRun.executor.wait_for_connection()
except Exception:
raise Exception("Failed to connect to DUT.")
TestRun.setup() TestRun.setup()
except Exception as ex: except Exception as ex:
raise Exception(f"Exception occurred during test setup:\n" raise Exception(f"Exception occurred during test setup:\n"