summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com>2018-06-21 13:04:50 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-06-21 13:04:50 +0000
commit0af2b92e25345ec15649424d786142ea126e66ac (patch)
treefd59690be33e0070b32613ffef9fb29e55759e9f
parent6ad50ee62571c9a860a728022a6c892b56fb0511 (diff)
parent5506dbf8d9163318f8028b7fabca416a3b7a2438 (diff)
Merge "Remove __init__ method overriding in HeatContextTestCase" into stable/fraser
-rw-r--r--yardstick/tests/unit/benchmark/contexts/test_heat.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/yardstick/tests/unit/benchmark/contexts/test_heat.py b/yardstick/tests/unit/benchmark/contexts/test_heat.py
index 625f97bf4..8febfc9de 100644
--- a/yardstick/tests/unit/benchmark/contexts/test_heat.py
+++ b/yardstick/tests/unit/benchmark/contexts/test_heat.py
@@ -13,29 +13,26 @@ import logging
import os
import mock
-import unittest
+from yardstick import ssh
from yardstick.benchmark.contexts import base
from yardstick.benchmark.contexts import heat
from yardstick.benchmark.contexts import model
from yardstick.common import constants as consts
from yardstick.common import exceptions as y_exc
-from yardstick import ssh
+from yardstick.tests.unit import base as ut_base
LOG = logging.getLogger(__name__)
-class HeatContextTestCase(unittest.TestCase):
-
- def __init__(self, *args, **kwargs):
- super(HeatContextTestCase, self).__init__(*args, **kwargs)
- self.name_iter = ('vnf{:03}'.format(x) for x in count(0, step=3))
+class HeatContextTestCase(ut_base.BaseUnitTestCase):
def setUp(self):
self.test_context = heat.HeatContext()
self.addCleanup(self._remove_contexts)
self.mock_context = mock.Mock(spec=heat.HeatContext())
+ self.name_iter = ('vnf{:03}'.format(x) for x in count(0, step=3))
def _remove_contexts(self):
if self.test_context in self.test_context.list: