openstack/cinder-tempest-plugin
Code Issues Proposed changes

Correct plugin test location reporting

Browse Source 
Commit 6f67e37873 changed the
directory structure for the plugin, but the code that reports
where the tests can be found was not fully updated.

This updates the plugin reporting to get the correct directory
for tempest to look in and cleans up a few nits with the file.

Change-Id: Ib89f7a9493e3d83382d8dd1f07a3e9e4bb4fcd80
Closes-bug: #1745175
This commit is contained in:
Sean McGinnis 2018-01-24 15:36:06 -06:00
parent 75511e3a85
commit cf556b5160
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
cinder_tempest_plugin/plugin.py
View File

@ -13,31 +13,45 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import cinder
import os import os
from cinder_tempest_plugin import config as project_config
from tempest import config from tempest import config
from tempest.test_discover import plugins from tempest.test_discover import plugins
from cinder_tempest_plugin import config as project_config
class CinderTempestPlugin(plugins.TempestPlugin): class CinderTempestPlugin(plugins.TempestPlugin):
def load_tests(self): def load_tests(self):
"""Provides information to load the plugin tests.
:return: A tuple with the first value being the test dir and the
second being the top level dir.
"""
base_path = os.path.split(os.path.dirname( base_path = os.path.split(os.path.dirname(
os.path.abspath(cinder.__file__)))[0] os.path.abspath(__file__)))[0]
test_dir = "cinder_tempest_plugin" test_dir = "cinder_tempest_plugin"
full_test_dir = os.path.join(base_path, test_dir) full_test_dir = os.path.join(base_path, test_dir)
return full_test_dir, base_path return full_test_dir, base_path
def register_opts(self, conf): def register_opts(self, conf):
config.register_opt_group( """Adds additional configuration options to tempest.
conf, config.volume_feature_group,
project_config.cinder_option This method will be run for the plugin during the register_opts()
) function in tempest.config
:param conf: The conf object that can be used to register additional
options.
"""
config.register_opt_group(conf, config.volume_feature_group,
project_config.cinder_option)
def get_opt_lists(self): def get_opt_lists(self):
"""Get a list of options for sample config generation.
:return: A list of tuples with the group name and options in that
group.
"""
return [ return [
(config.volume_feature_group.name, (config.volume_feature_group.name, project_config.cinder_option),
project_config.cinder_option),
] ]