Merge "Removed unnecessary setUp calls in tests"

This commit is contained in:
Jenkins
2017-08-11 09:15:01 +00:00
committed by Gerrit Code Review
10 changed files with 1 additions and 29 deletions

View File

@@ -16,5 +16,4 @@ from watcher.tests.api import base as api_base
class TestV1Routing(api_base.FunctionalTest):
def setUp(self):
super(TestV1Routing, self).setUp()
pass

View File

@@ -31,9 +31,6 @@ class TestTriggerActionPlan(base.TestCase):
self.applier = mock.MagicMock()
self.endpoint = trigger.TriggerActionPlan(self.applier)
def setUp(self):
super(TestTriggerActionPlan, self).setUp()
def test_launch_action_plan(self):
action_plan_uuid = utils.generate_uuid()
expected_uuid = self.endpoint.launch_action_plan(self.context,

View File

@@ -30,9 +30,6 @@ class TestApplierAPI(base.TestCase):
api = rpcapi.ApplierAPI()
def setUp(self):
super(TestApplierAPI, self).setUp()
def test_get_api_version(self):
with mock.patch.object(om.RPCClient, 'call') as mock_call:
expected_context = self.context

View File

@@ -25,9 +25,6 @@ from watcher.tests import base
@mock.patch.object(clients.OpenStackClients, 'cinder')
class TestCinderHelper(base.TestCase):
def setUp(self):
super(TestCinderHelper, self).setUp()
@staticmethod
def fake_storage_node(**kwargs):
node = mock.MagicMock()

View File

@@ -45,9 +45,6 @@ class DummyManager(object):
class TestServiceHeartbeat(base.TestCase):
def setUp(self):
super(TestServiceHeartbeat, self).setUp()
@mock.patch.object(objects.Service, 'list')
@mock.patch.object(objects.Service, 'create')
def test_send_beat_with_creating_service(self, mock_create,

View File

@@ -24,9 +24,6 @@ from watcher.tests import base
class TestDummyScorer(base.TestCase):
def setUp(self):
super(TestDummyScorer, self).setUp()
def test_metadata(self):
scorer = dummy_scorer.DummyScorer(config=None)
self.assertEqual('dummy_scorer', scorer.get_name())

View File

@@ -24,9 +24,6 @@ from watcher.tests import base
class TestDummyScoringContainer(base.TestCase):
def setUp(self):
super(TestDummyScoringContainer, self).setUp()
def test_get_scoring_engine_list(self):
scorers = (dummy_scoring_container.DummyScoringContainer
.get_scoring_engine_list())

View File

@@ -22,9 +22,6 @@ from watcher.tests import base
class TestScoringFactory(base.TestCase):
def setUp(self):
super(TestScoringFactory, self).setUp()
def test_get_scoring_engine(self):
scorer = scoring_factory.get_scoring_engine('dummy_scorer')
self.assertEqual('dummy_scorer', scorer.get_name())

View File

@@ -26,9 +26,6 @@ from watcher.tests import base
class TestStrategySelector(base.TestCase):
def setUp(self):
super(TestStrategySelector, self).setUp()
@mock.patch.object(default_loader.DefaultStrategyLoader, 'load')
def test_select_with_strategy_name(self, m_load):
expected_goal = 'dummy'

View File

@@ -24,9 +24,6 @@ from watcher.tests import base
class TestDecisionEngineAPI(base.TestCase):
def setUp(self):
super(TestDecisionEngineAPI, self).setUp()
api = rpcapi.DecisionEngineAPI()
def test_get_api_version(self):