openstack/placement
Code Issues Proposed changes

Adds workaround check for mox in to_primitive

Browse Source 
* Works around bug 852095
 * Can be removed if a consistent mox 5.4 is released

Change-Id: I3e57b60886a94c5e7a337b73716759c9a6838e04
This commit is contained in:
Vishvananda Ishaya 2012-01-06 02:18:22 +00:00
parent b85734330a
commit f9409a8f24
1 changed files with 7 additions and 0 deletions

7
nova/utils.py

@ -41,6 +41,7 @@ from eventlet import event
from eventlet import greenthread
from eventlet import semaphore
from eventlet.green import subprocess
import mox
import netaddr
from nova import exception
@ -689,6 +690,12 @@ def to_primitive(value, convert_instances=False, level=0):
if test(value):
return unicode(value)
# NOTE(vish): Workaround for LP bug 852095. Without this workaround,
# tests that raise an exception in a mocked method that
# has a @wrap_exception with a notifier will fail.
if isinstance(value, mox.MockAnything):
return 'mock'
if level > 3:
return '?'