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

Merge pull request #170 from robertbaldyga/move-git-utils

Browse Source 
Use git utils from cas API
This commit is contained in:
Michal Rakowski 2019-10-30 14:32:25 +01:00 committed by GitHub
commit 193937478b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
test/functional/api/cas/git.py Normal file
View File

@ -0,0 +1,21 @@
#
# Copyright(c) 2019 Intel Corporation
# SPDX-License-Identifier: BSD-3-Clause-Clear
#
from core.test_run import TestRun
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'git show HEAD --pretty=format:"%H"').stdout
def get_current_commit_message():
local_executor = LocalExecutor()
return local_executor.run(
f"cd {TestRun.plugins['opencas']['repo_dir']} &&"
f'git show HEAD --pretty=format:"%s"').stdout

2
test/functional/test-framework

@ -1 +1 @@
Subproject commit 68afc1655f85c1fa3d523c50a02bcf56ed47cc67 Subproject commit de0721eb52fbe548a8e7810913151e2e37c66d1c

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

@ -15,9 +15,9 @@ sys.path.append(os.path.join(os.path.dirname(__file__), "../test-framework"))
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
from api.cas import git
from test_utils.os_utils import Udev from test_utils.os_utils import Udev
from log.logger import create_log from log.logger import create_log
from test_utils import git_utils
plugins_dir = os.path.join(os.path.dirname(__file__), "../plugins") plugins_dir = os.path.join(os.path.dirname(__file__), "../plugins")
sys.path.append(plugins_dir) sys.path.append(plugins_dir)
@ -181,6 +181,6 @@ def base_prepare(item):
installer.install_opencas() installer.install_opencas()
TestRun.plugins['opencas']['already_updated'] = True TestRun.plugins['opencas']['already_updated'] = True
TestRun.LOGGER.add_build_info(f'Commit hash:') TestRun.LOGGER.add_build_info(f'Commit hash:')
TestRun.LOGGER.add_build_info(f"{git_utils.get_current_commit_hash()}") TestRun.LOGGER.add_build_info(f"{git.get_current_commit_hash()}")
TestRun.LOGGER.add_build_info(f'Commit message:') TestRun.LOGGER.add_build_info(f'Commit message:')
TestRun.LOGGER.add_build_info(f'{git_utils.get_current_commit_message()}') TestRun.LOGGER.add_build_info(f'{git.get_current_commit_message()}')