x/gantt
Code Issues Proposed changes

Implements a simplified messaging abstraction with the least amount of impact to the code base.

Browse Source
This commit is contained in:
Zed Shaw
2011-07-26 16:29:50 -07:00
parent 390346c891
commit 444801ca4d
11 changed files with 751 additions and 715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nova/test.py
View File

@@ -99,9 +99,7 @@ class TestCase(unittest.TestCase):
self.flag_overrides = {}
self.injected = []
self._services = []
self._monkey_patch_attach()
self._original_flags = FLAGS.FlagValuesDict()
rpc.ConnectionPool = rpc.Pool(max_size=FLAGS.rpc_conn_pool_size)
def tearDown(self):
"""Runs after each test method to tear down test environment."""
@@ -126,9 +124,6 @@ class TestCase(unittest.TestCase):
# Reset any overriden flags
self.reset_flags()
# Reset our monkey-patches
rpc.Consumer.attach_to_eventlet = self.original_attach
# Stop any timers
for x in self.injected:
try:
@@ -172,17 +167,6 @@ class TestCase(unittest.TestCase):
self._services.append(svc)
return svc
def _monkey_patch_attach(self):
self.original_attach = rpc.Consumer.attach_to_eventlet
def _wrapped(inner_self):
rv = self.original_attach(inner_self)
self.injected.append(rv)
return rv
_wrapped.func_name = self.original_attach.func_name
rpc.Consumer.attach_to_eventlet = _wrapped
# Useful assertions
def assertDictMatch(self, d1, d2, approx_equal=False, tolerance=0.001):
"""Assert two dicts are equivalent.