openstack/python-tripleoclient
Code Issues Proposed changes

Add tools/run-tests.sh instead of run_tempest.sh

Browse Source 
Change-Id: I78207401e38840a481b473d2a0150cd95e86b8b5
This commit is contained in:
Mathieu Bultel
2015-06-22 23:45:14 +02:00
parent a933eec21d
commit 9e10a840ac
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rdomanager_oscplugin/tests/v1/overcloud_validate/test_overcloud_validate.py
View File

@@ -68,6 +68,5 @@ class TestOvercloudValidate(fakes.TestOvercloudValidate):
'network.build_timeout 500 ' 'network.build_timeout 500 '
'volume.build_timeout 500 ' 'volume.build_timeout 500 '
'scenario.ssh_user cirros'), 'scenario.ssh_user cirros'),
mock.call('./run_tempest.sh --no-virtual-env -- bar 2>&1 | ' mock.call('./tools/run-tests.sh bar')
'tee /home/user/tempest/tempest-run.log')
]) ])

2
rdomanager_oscplugin/utils.py
View File

@@ -376,4 +376,4 @@ def create_cephx_key():
def run_shell(cmd): def run_shell(cmd):
return subprocess.check_call([cmd], shell=True) return subprocess.call([cmd], shell=True)

12
rdomanager_oscplugin/v1/overcloud_validate.py
View File

@@ -54,14 +54,10 @@ class ValidateOvercloud(command.Command):
{'auth_url': overcloud_auth_url, {'auth_url': overcloud_auth_url,
'admin_password': overcloud_admin_password}) 'admin_password': overcloud_admin_password})
full_tempest_args = '--no-virtual-env' if tempest_args is None:
if tempest_args: utils.run_shell('./tools/run-tests.sh')
full_tempest_args = '%s -- %s' % (full_tempest_args, tempest_args) else:
log_file = os.path.join(tempest_run_dir, "tempest-run.log") utils.run_shell('./tools/run-tests.sh %s' % tempest_args)
utils.run_shell('./run_tempest.sh %(tempest_args)s 2>&1 '
'| tee %(log_file)s' %
{'tempest_args': full_tempest_args,
'log_file': log_file})
def get_parser(self, prog_name): def get_parser(self, prog_name):
parser = super(ValidateOvercloud, self).get_parser(prog_name) parser = super(ValidateOvercloud, self).get_parser(prog_name)