summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChangBo Guo(gcb) <eric.guo@easystack.cn>2015-12-02 12:08:05 +0800
committerChangBo Guo(gcb) <eric.guo@easystack.cn>2015-12-02 14:55:16 +0800
commit2894fee81a2a0e64f8358ad9d62c1d10b859bdee (patch)
treeccb5b8bd0b067f8ecfae7e4ad1853c2eeb3249c3
parent1d6f6586abe4d6df5c477cfaef16783163a69f93 (diff)
downloadironic-2894fee81a2a0e64f8358ad9d62c1d10b859bdee.tar.gz
test: Remove _BaseTestCase
In oslo.versionedobjects we are removing remote_object_calls in I24fe19daf6a5c8d234794f28073fd069101d9a11. It's meaningless to test remote_object_calls in _BaseTestCase, so just remove _BaseTestCase. Change-Id: I3701fbd1cf24d05cf0881e17742cc0ce34f0c2b4
-rw-r--r--ironic/tests/unit/objects/test_objects.py19
1 files changed, 1 insertions, 18 deletions
diff --git a/ironic/tests/unit/objects/test_objects.py b/ironic/tests/unit/objects/test_objects.py
index 7a2b2cc94..0a13d16fe 100644
--- a/ironic/tests/unit/objects/test_objects.py
+++ b/ironic/tests/unit/objects/test_objects.py
@@ -94,21 +94,12 @@ class TestSubclassedObject(MyObj):
fields = {'new_field': fields.StringField()}
-class _BaseTestCase(test_base.TestCase):
- def setUp(self):
- super(_BaseTestCase, self).setUp()
- self.remote_object_calls = list()
-
-
-class _LocalTest(_BaseTestCase):
+class _LocalTest(test_base.TestCase):
def setUp(self):
super(_LocalTest, self).setUp()
# Just in case
base.IronicObject.indirection_api = None
- def assertRemotes(self):
- self.assertEqual([], self.remote_object_calls)
-
@contextlib.contextmanager
def things_temporarily_local():
@@ -223,14 +214,12 @@ class _TestObject(object):
obj = MyObj.query(ctxt1)
obj.update_test(ctxt2)
self.assertEqual('alternate-context', obj.bar)
- self.assertRemotes()
def test_orphaned_object(self):
obj = MyObj.query(self.context)
obj._context = None
self.assertRaises(object_exception.OrphanedObjectError,
obj.update_test)
- self.assertRemotes()
def test_changed_1(self):
obj = MyObj.query(self.context)
@@ -239,7 +228,6 @@ class _TestObject(object):
obj.update_test(self.context)
self.assertEqual(set(['foo', 'bar']), obj.obj_what_changed())
self.assertEqual(123, obj.foo)
- self.assertRemotes()
def test_changed_2(self):
obj = MyObj.query(self.context)
@@ -248,7 +236,6 @@ class _TestObject(object):
obj.save()
self.assertEqual(set([]), obj.obj_what_changed())
self.assertEqual(123, obj.foo)
- self.assertRemotes()
def test_changed_3(self):
obj = MyObj.query(self.context)
@@ -258,7 +245,6 @@ class _TestObject(object):
self.assertEqual(set([]), obj.obj_what_changed())
self.assertEqual(321, obj.foo)
self.assertEqual('refreshed', obj.bar)
- self.assertRemotes()
def test_changed_4(self):
obj = MyObj.query(self.context)
@@ -268,21 +254,18 @@ class _TestObject(object):
self.assertEqual(set(['foo']), obj.obj_what_changed())
self.assertEqual(42, obj.foo)
self.assertEqual('meow', obj.bar)
- self.assertRemotes()
def test_static_result(self):
obj = MyObj.query(self.context)
self.assertEqual('bar', obj.bar)
result = obj.marco()
self.assertEqual('polo', result)
- self.assertRemotes()
def test_updates(self):
obj = MyObj.query(self.context)
self.assertEqual(1, obj.foo)
obj.update_test()
self.assertEqual('updated', obj.bar)
- self.assertRemotes()
def test_base_attributes(self):
dt = datetime.datetime(1955, 11, 5, 0, 0, tzinfo=iso8601.iso8601.Utc())