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

Simplify waiting for connection

Browse Source 
Signed-off-by: Robert Baldyga <robert.baldyga@intel.com>
This commit is contained in:
Robert Baldyga 2019-10-29 10:09:14 +01:00
parent b65ff40bf0
commit ba9876ed52
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,8 +12,6 @@ from IPy import IP
sys.path.append(os.path.join(os.path.dirname(__file__), "../test-framework")) sys.path.append(os.path.join(os.path.dirname(__file__), "../test-framework"))
from connection.ssh_executor import SshExecutor
from core.test_run_utils import TestRun from core.test_run_utils import TestRun
from api.cas import installer from api.cas import installer
from api.cas import casadm from api.cas import casadm
@ -93,9 +91,7 @@ def pytest_runtest_teardown():
with TestRun.LOGGER.step("Cleanup after test"): with TestRun.LOGGER.step("Cleanup after test"):
try: try:
ssh_e = type(TestRun.executor) is SshExecutor if TestRun.executor.is_active():
is_active = TestRun.executor.is_active()
if ssh_e and not is_active:
TestRun.executor.wait_for_connection() TestRun.executor.wait_for_connection()
Udev.enable() Udev.enable()
unmount_cas_devices() unmount_cas_devices()