diff --git a/murano_plugin_tests/helpers/helpers.py b/murano_plugin_tests/helpers/helpers.py index 0fd5237..debc201 100644 --- a/murano_plugin_tests/helpers/helpers.py +++ b/murano_plugin_tests/helpers/helpers.py @@ -125,6 +125,7 @@ class PluginHelper(object): :type options: boolean :returns: None """ + if options is None: options = {} msg = "Plugin {0} isn't found.".format(name) diff --git a/murano_plugin_tests/murano_plugin/plugin_settings.py b/murano_plugin_tests/murano_plugin/plugin_settings.py index 8bc97ec..0a2a09e 100644 --- a/murano_plugin_tests/murano_plugin/plugin_settings.py +++ b/murano_plugin_tests/murano_plugin/plugin_settings.py @@ -17,18 +17,14 @@ from murano_plugin_tests import settings name = 'detach-murano' -role_name = ['murano-node'] +role_name = 'murano-node' plugin_path = settings.MURANO_PLUGIN_PATH version = helpers.get_plugin_version(plugin_path) -murano_user = 'murano' -murano_db_password = 'murano_db_password' glare = True a_o_o = 'http://storage.apps.openstack.org/' default_options = { - 'murano_user_password/value': murano_user, - 'murano_db_password/value': murano_db_password, 'murano_glance_artifacts/value': glare, 'murano_repo_url/value': a_o_o } diff --git a/murano_plugin_tests/murano_plugin/test_murano_plugin_bvt.py b/murano_plugin_tests/murano_plugin/test_murano_plugin_bvt.py index 49bcb73..19ba411 100644 --- a/murano_plugin_tests/murano_plugin/test_murano_plugin_bvt.py +++ b/murano_plugin_tests/murano_plugin/test_murano_plugin_bvt.py @@ -18,7 +18,6 @@ from plugin_settings import base_nodes from proboscis import test - @test(groups=["plugins"]) class TestMuranoPluginBvt(api.MuranoPluginApi): """Class for bvt testing the Murano plugin.""" @@ -43,7 +42,6 @@ class TestMuranoPluginBvt(api.MuranoPluginApi): Duration 120m Snapshot deploy_murano_bvt """ - self.check_run("deploy_ceilometer_redis") self.env.revert_snapshot("ready_with_5_slaves") self.prepare_plugin()