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

Make opencas plugin as singleton class

Browse Source
This commit is contained in:
Katarzyna Lapinska
2019-11-05 15:00:47 +01:00
parent 5d643a48d8
commit eedb4ded7c
4 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/functional/api/cas/git.py
View File

@@ -10,12 +10,12 @@ from connection.local_executor import LocalExecutor
def get_current_commit_hash():
local_executor = LocalExecutor()
return local_executor.run(
f"cd {TestRun.plugins['opencas']['repo_dir']} &&"
f"cd {TestRun.plugins['opencas'].repo_dir} &&"
f'git show HEAD -s --pretty=format:"%H"').stdout
def get_current_commit_message():
local_executor = LocalExecutor()
return local_executor.run(
f"cd {TestRun.plugins['opencas']['repo_dir']} &&"
f"cd {TestRun.plugins['opencas'].repo_dir} &&"
f'git show HEAD -s --pretty=format:"%B"').stdout

10
test/functional/api/cas/installer.py
View File

@@ -13,13 +13,13 @@ from core.test_run import TestRun
def install_opencas():
TestRun.LOGGER.info("Copying Open CAS repository to DUT")
TestRun.executor.rsync(
f"{TestRun.plugins['opencas']['repo_dir']}/",
f"{TestRun.plugins['opencas']['working_dir']}/",
f"{TestRun.plugins['opencas'].repo_dir}/",
f"{TestRun.plugins['opencas'].working_dir}/",
delete=True)
TestRun.LOGGER.info("Building Open CAS")
output = TestRun.executor.run(
f"cd {TestRun.plugins['opencas']['working_dir']} && "
f"cd {TestRun.plugins['opencas'].working_dir} && "
"./configure && "
"make -j")
if output.exit_code != 0:
@@ -28,7 +28,7 @@ def install_opencas():
TestRun.LOGGER.info("Installing Open CAS")
output = TestRun.executor.run(
f"cd {TestRun.plugins['opencas']['working_dir']} && "
f"cd {TestRun.plugins['opencas'].working_dir} && "
f"make install")
if output.exit_code != 0:
TestRun.exception(
@@ -50,7 +50,7 @@ def uninstall_opencas():
TestRun.exception("Open CAS is not properly installed")
else:
TestRun.executor.run(
f"cd {TestRun.plugins['opencas']['working_dir']} && "
f"cd {TestRun.plugins['opencas'].working_dir} && "
f"make uninstall")
if output.exit_code != 0:
TestRun.exception(