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

Merge pull request #194 from mmichal10/extend-dut-config-file

Browse Source 
Extend dut config file
This commit is contained in:
Michal Rakowski 2019-11-22 11:23:05 +01:00 committed by GitHub
commit a08e6fffef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/functional/config/example_dut_config.yml
View File

@ -8,6 +8,9 @@ type: "local"
# env: "HTTPS_PROXY=myproxy.example:12345" # env: "HTTPS_PROXY=myproxy.example:12345"
# By enabling this option framework is allowed to retrieve random non-os disks from DUT.
# It can lead to data loss!!!
allow_disk_autoselect: False
working_dir: "/tmp/open-cas-linux/" working_dir: "/tmp/open-cas-linux/"
disks: disks:

2
test/functional/test-framework

@ -1 +1 @@
Subproject commit 7c5c8fd5143497c56a8fb0cc1fe9a923f48a9db1 Subproject commit 547fcaa5fb0cdc3ce5696785ce7d7ced81a85005

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

@ -16,6 +16,7 @@ from api.cas import installer
from api.cas import casadm from api.cas import casadm
from api.cas import git from api.cas import git
from test_utils.os_utils import Udev from test_utils.os_utils import Udev
from test_tools.disk_utils import PartitionTable, create_partition_table
from log.logger import create_log, Log from log.logger import create_log, Log
from test_utils.singleton import Singleton from test_utils.singleton import Singleton
@ -181,6 +182,11 @@ def base_prepare(item):
except Exception: except Exception:
pass # TODO: Reboot DUT if test is executed remotely pass # TODO: Reboot DUT if test is executed remotely
for disk in TestRun.dut.disks:
disk.umount_all_partitions()
if not create_partition_table(disk, PartitionTable.gpt):
TestRun.exception(f"Failed to remove partitions from {disk}")
if get_force_param(item) and not TestRun.plugins['opencas'].already_updated: if get_force_param(item) and not TestRun.plugins['opencas'].already_updated:
installer.reinstall_opencas() installer.reinstall_opencas()
elif not installer.check_if_installed(): elif not installer.check_if_installed():