diff options
author | Clint Byrum <clint@fewbar.com> | 2013-04-26 15:49:33 -0700 |
---|---|---|
committer | Clint Byrum <clint@fewbar.com> | 2013-04-30 13:51:31 -0700 |
commit | 2c4eea5500691a7cbc84fc0273a5a79bc03fe78d (patch) | |
tree | ffdf6778b9da77d60415f60b047b00777ec243c9 /heat/tests/test_instance_group.py | |
parent | fb6de9419fe729f2a46dcb10ce6191439d933218 (diff) | |
download | heat-2c4eea5500691a7cbc84fc0273a5a79bc03fe78d.tar.gz |
Remove use of nose attrib plugin and most unittest
Some simple cases that do not use mox still use unittest directly.
Replacing unittest.TestCase with HeatTestCase has the added benefit of
capturing all logging for reporting during failure.
Change-Id: I76192bdb91822055f1e2f7d2e806bf094d399304
Diffstat (limited to 'heat/tests/test_instance_group.py')
-rw-r--r-- | heat/tests/test_instance_group.py | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/heat/tests/test_instance_group.py b/heat/tests/test_instance_group.py index e244b0c4e..0d6764b98 100644 --- a/heat/tests/test_instance_group.py +++ b/heat/tests/test_instance_group.py @@ -16,11 +16,8 @@ import copy import os import eventlet -import unittest import mox -from nose.plugins.attrib import attr - from heat.tests.v1_1 import fakes from heat.common import context from heat.common import exception @@ -30,21 +27,17 @@ from heat.engine.resources import instance from heat.engine.resources import loadbalancer from heat.engine import parser from heat.engine import scheduler +from heat.tests.common import HeatTestCase from heat.tests.utils import setup_dummy_db -@attr(tag=['unit', 'resource']) -@attr(speed='fast') -class InstanceGroupTest(unittest.TestCase): +class InstanceGroupTest(HeatTestCase): def setUp(self): + super(InstanceGroupTest, self).setUp() self.fc = fakes.FakeClient() - self.m = mox.Mox() self.m.StubOutWithMock(loadbalancer.LoadBalancer, 'reload') setup_dummy_db() - def tearDown(self): - self.m.UnsetStubs() - def load_template(self): self.path = os.path.dirname(os.path.realpath(__file__)).\ replace('heat/tests', 'templates') |