From a68eb0d619ca1712300fab9d756954834accbf74 Mon Sep 17 00:00:00 2001 From: David TARDIVEL Date: Tue, 12 Jul 2016 16:54:38 +0200 Subject: [PATCH] Update unitaty tests to verify strategy and goal name strategy and goal name must be synched with entry point names. Change-Id: I776ed98f5c13d176fdb0b8677d609fcb1ec9a235 Closes-Bug: #1602262 --- setup.cfg | 2 +- watcher/common/loader/default.py | 1 - watcher/tests/decision_engine/goal/test_goal_loader.py | 2 +- .../strategy/loading/test_default_strategy_loader.py | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/setup.cfg b/setup.cfg index 4569879eb..822f06931 100644 --- a/setup.cfg +++ b/setup.cfg @@ -56,7 +56,7 @@ watcher_goals = watcher_strategies = dummy = watcher.decision_engine.strategy.strategies.dummy_strategy:DummyStrategy basic = watcher.decision_engine.strategy.strategies.basic_consolidation:BasicConsolidation - outlet_temp_control = watcher.decision_engine.strategy.strategies.outlet_temp_control:OutletTempControl + outlet_temperature = watcher.decision_engine.strategy.strategies.outlet_temp_control:OutletTempControl vm_workload_consolidation = watcher.decision_engine.strategy.strategies.vm_workload_consolidation:VMWorkloadConsolidation workload_stabilization = watcher.decision_engine.strategy.strategies.workload_stabilization:WorkloadStabilization workload_balance = watcher.decision_engine.strategy.strategies.workload_balance:WorkloadBalance diff --git a/watcher/common/loader/default.py b/watcher/common/loader/default.py index ae295646b..586cfd915 100644 --- a/watcher/common/loader/default.py +++ b/watcher/common/loader/default.py @@ -70,7 +70,6 @@ class DefaultLoader(base.BaseLoader): """Load the config of the plugin""" config = utils.Struct() config_opts = driver_cls.get_config_opts() - if not config_opts: return config diff --git a/watcher/tests/decision_engine/goal/test_goal_loader.py b/watcher/tests/decision_engine/goal/test_goal_loader.py index 877be9231..13ab6185e 100644 --- a/watcher/tests/decision_engine/goal/test_goal_loader.py +++ b/watcher/tests/decision_engine/goal/test_goal_loader.py @@ -75,4 +75,4 @@ class TestLoadGoalsWithDefaultGoalLoader(base.TestCase): def test_load_goals(self): goal = self.goal_loader.load(self.goal_name) self.assertIsNotNone(goal) - self.assertEqual(self.goal_cls.get_name(), goal.name) + self.assertEqual(self.goal_name, goal.name) diff --git a/watcher/tests/decision_engine/strategy/loading/test_default_strategy_loader.py b/watcher/tests/decision_engine/strategy/loading/test_default_strategy_loader.py index 3248a8876..5bb3c58f5 100644 --- a/watcher/tests/decision_engine/strategy/loading/test_default_strategy_loader.py +++ b/watcher/tests/decision_engine/strategy/loading/test_default_strategy_loader.py @@ -75,4 +75,4 @@ class TestLoadStrategiesWithDefaultStrategyLoader(base.TestCase): def test_load_strategies(self): strategy = self.strategy_loader.load(self.strategy_name) self.assertIsNotNone(strategy) - self.assertEqual(self.strategy_cls.get_name(), strategy.name) + self.assertEqual(self.strategy_name, strategy.name)