From e29d4f30e26ae5bb9fe1e01d400c36aff25cf3a1 Mon Sep 17 00:00:00 2001 From: liathartal Date: Wed, 23 Mar 2016 15:05:25 +0000 Subject: [PATCH] replace setup method with setUpClass 2 Change-Id: I4b692cb47c5bcc9f1aa656c39a1e1409719f637a --- .../plugins/static_physical/synchronizer.py | 1 - .../plugins/nagios/test_nagios_alarm_transformer.py | 11 +++++------ .../plugins/nova/test_nova_host_transformer.py | 11 +++++------ .../plugins/nova/test_nova_instance_transformers.py | 11 +++++------ .../plugins/nova/test_nova_zone_transformer.py | 10 +++++----- .../test_static_physical_synchronizer.py | 12 ++++++------ .../test_static_physical_transformer.py | 13 ++++++------- 7 files changed, 32 insertions(+), 37 deletions(-) diff --git a/vitrage/synchronizer/plugins/static_physical/synchronizer.py b/vitrage/synchronizer/plugins/static_physical/synchronizer.py index e2df0d17c..9fe83c1a4 100644 --- a/vitrage/synchronizer/plugins/static_physical/synchronizer.py +++ b/vitrage/synchronizer/plugins/static_physical/synchronizer.py @@ -67,7 +67,6 @@ class StaticPhysicalSynchronizer(SynchronizerBase): return static_entities def _get_changes_entities(self): - entities_updates = [] entities_updates = [] files = file_utils.load_files( diff --git a/vitrage/tests/unit/synchronizer/plugins/nagios/test_nagios_alarm_transformer.py b/vitrage/tests/unit/synchronizer/plugins/nagios/test_nagios_alarm_transformer.py index 7a9c1bce5..4789ef69e 100644 --- a/vitrage/tests/unit/synchronizer/plugins/nagios/test_nagios_alarm_transformer.py +++ b/vitrage/tests/unit/synchronizer/plugins/nagios/test_nagios_alarm_transformer.py @@ -37,12 +37,11 @@ LOG = logging.getLogger(__name__) class NagiosTransformerTest(base.BaseTest): # noinspection PyAttributeOutsideInit - def setUp(self): - super(NagiosTransformerTest, self).setUp() - - self.transformers = {} - host_transformer = HostTransformer(self.transformers) - self.transformers[NOVA_HOST_PLUGIN] = host_transformer + @classmethod + def setUpClass(cls): + cls.transformers = {} + host_transformer = HostTransformer(cls.transformers) + cls.transformers[NOVA_HOST_PLUGIN] = host_transformer def test_extract_key(self): LOG.debug('Test get key from nova instance transformer') diff --git a/vitrage/tests/unit/synchronizer/plugins/nova/test_nova_host_transformer.py b/vitrage/tests/unit/synchronizer/plugins/nova/test_nova_host_transformer.py index c3de22e6b..f5d6b0222 100644 --- a/vitrage/tests/unit/synchronizer/plugins/nova/test_nova_host_transformer.py +++ b/vitrage/tests/unit/synchronizer/plugins/nova/test_nova_host_transformer.py @@ -37,12 +37,11 @@ LOG = logging.getLogger(__name__) class NovaHostTransformerTest(base.BaseTest): # noinspection PyAttributeOutsideInit - def setUp(self): - super(NovaHostTransformerTest, self).setUp() - - self.transformers = {} - zone_transformer = ZoneTransformer(self.transformers) - self.transformers[NOVA_ZONE_PLUGIN] = zone_transformer + @classmethod + def setUpClass(cls): + cls.transformers = {} + zone_transformer = ZoneTransformer(cls.transformers) + cls.transformers[NOVA_ZONE_PLUGIN] = zone_transformer def test_create_placeholder_vertex(self): LOG.debug('Nova host transformer test: Test create placeholder vertex') diff --git a/vitrage/tests/unit/synchronizer/plugins/nova/test_nova_instance_transformers.py b/vitrage/tests/unit/synchronizer/plugins/nova/test_nova_instance_transformers.py index e90ad48dc..6256d9245 100644 --- a/vitrage/tests/unit/synchronizer/plugins/nova/test_nova_instance_transformers.py +++ b/vitrage/tests/unit/synchronizer/plugins/nova/test_nova_instance_transformers.py @@ -38,12 +38,11 @@ LOG = logging.getLogger(__name__) class NovaInstanceTransformerTest(base.BaseTest): # noinspection PyAttributeOutsideInit - def setUp(self): - super(NovaInstanceTransformerTest, self).setUp() - - self.transformers = {} - host_transformer = HostTransformer(self.transformers) - self.transformers[NOVA_HOST_PLUGIN] = host_transformer + @classmethod + def setUpClass(cls): + cls.transformers = {} + host_transformer = HostTransformer(cls.transformers) + cls.transformers[NOVA_HOST_PLUGIN] = host_transformer def test_create_placeholder_vertex(self): LOG.debug('Test create placeholder vertex') diff --git a/vitrage/tests/unit/synchronizer/plugins/nova/test_nova_zone_transformer.py b/vitrage/tests/unit/synchronizer/plugins/nova/test_nova_zone_transformer.py index 038daccd9..c87f149a9 100644 --- a/vitrage/tests/unit/synchronizer/plugins/nova/test_nova_zone_transformer.py +++ b/vitrage/tests/unit/synchronizer/plugins/nova/test_nova_zone_transformer.py @@ -36,12 +36,12 @@ LOG = logging.getLogger(__name__) class NovaZoneTransformerTest(base.BaseTest): # noinspection PyAttributeOutsideInit - def setUp(self): - super(NovaZoneTransformerTest, self).setUp() + @classmethod + def setUpClass(cls): - self.transformers = {} - host_transformer = HostTransformer(self.transformers) - self.transformers[NOVA_HOST_PLUGIN] = host_transformer + cls.transformers = {} + host_transformer = HostTransformer(cls.transformers) + cls.transformers[NOVA_HOST_PLUGIN] = host_transformer def test_create_placeholder_vertex(self): diff --git a/vitrage/tests/unit/synchronizer/plugins/static_physical/test_static_physical_synchronizer.py b/vitrage/tests/unit/synchronizer/plugins/static_physical/test_static_physical_synchronizer.py index 0b8fb4d23..cf06a046f 100644 --- a/vitrage/tests/unit/synchronizer/plugins/static_physical/test_static_physical_synchronizer.py +++ b/vitrage/tests/unit/synchronizer/plugins/static_physical/test_static_physical_synchronizer.py @@ -70,12 +70,12 @@ class TestStaticPhysicalSynchronizer(base.BaseTest): ] # noinspection PyAttributeOutsideInit - def setUp(self): - super(TestStaticPhysicalSynchronizer, self).setUp() - self.conf = cfg.ConfigOpts() - self.conf.register_opts(self.OPTS, group=STATIC_PHYSICAL_PLUGIN) - self.static_physical_synchronizer = \ - synchronizer.StaticPhysicalSynchronizer(self.conf) + @classmethod + def setUpClass(cls): + cls.conf = cfg.ConfigOpts() + cls.conf.register_opts(cls.OPTS, group=STATIC_PHYSICAL_PLUGIN) + cls.static_physical_synchronizer = \ + synchronizer.StaticPhysicalSynchronizer(cls.conf) def test_static_plugins_loader(self): # Setup diff --git a/vitrage/tests/unit/synchronizer/plugins/static_physical/test_static_physical_transformer.py b/vitrage/tests/unit/synchronizer/plugins/static_physical/test_static_physical_transformer.py index dce5e0d3c..dbbff65ca 100644 --- a/vitrage/tests/unit/synchronizer/plugins/static_physical/test_static_physical_transformer.py +++ b/vitrage/tests/unit/synchronizer/plugins/static_physical/test_static_physical_transformer.py @@ -35,14 +35,13 @@ LOG = logging.getLogger(__name__) class TestStaticPhysicalTransformer(base.BaseTest): # noinspection PyAttributeOutsideInit - def setUp(self): - super(TestStaticPhysicalTransformer, self).setUp() + @classmethod + def setUpClass(cls): - self.transformers = {} - host_transformer = HostTransformer(self.transformers) - static_transformer = StaticPhysicalTransformer(self.transformers) - self.transformers[NOVA_HOST_PLUGIN] = host_transformer - self.transformers[STATIC_PHYSICAL_PLUGIN] = static_transformer + cls.transformers = {} + cls.transformers[NOVA_HOST_PLUGIN] = HostTransformer(cls.transformers) + cls.transformers[STATIC_PHYSICAL_PLUGIN] = StaticPhysicalTransformer( + cls.transformers) def test_create_placeholder_vertex(self):