Adds workaround check for mox in to_primitive

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

Change-Id: I3e57b60886a94c5e7a337b73716759c9a6838e04

nova/utils.py

@@ -41,6 +41,7 @@
 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 '?'