openstack/nova
Code Issues Proposed changes

Merge "Enable all extension for image API sample tests"

Browse Source
This commit is contained in:
Jenkins
2015-12-03 00:20:46 +00:00
committed by Gerrit Code Review
parent 94692b3bc2 14eb1d7483
commit b4a5019410
18 changed files with 36 additions and 1067 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
nova/tests/functional/api_samples_test_base.py
View File

@@ -51,7 +51,12 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase):
def _get_sample_path(cls, name, dirname, suffix='', api_version=None):
parts = [dirname]
parts.append('api_samples')
if cls.all_extensions:
# TODO(gmann): Once all tests gets merged for all extension
# then we need to have a simple logic here to select sample file
# directory which will be based on cls.sample_dir and api_version.
# All other things will go away from here. Currently hacking this
# till we merge every extensions tests.
if cls.all_extensions and not cls.sample_dir:
parts.append('all_extensions')
# Note(gmann): if _use_common_server_api_samples is set to True
# then common server sample files present in 'servers' directory