From 94ac2c4747ae5e87db32a5ed4de82b0a0a1f5f0f Mon Sep 17 00:00:00 2001
From: Thierry Carrez <thierry@openstack.org>
Date: Thu, 2 Feb 2012 17:26:30 +0100
Subject: Avoid weird test error when mox is missing

Fail early if you can't import mox, rather than return
a cryptic and undecipherable error. Fixes bug 810424.

Change-Id: Ie56d3e7447bbba841fdc882cb1f8f70e234812ef
---
 nova/tests/__init__.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nova/tests/__init__.py b/nova/tests/__init__.py
index 676518a48..02bc77898 100644
--- a/nova/tests/__init__.py
+++ b/nova/tests/__init__.py
@@ -37,6 +37,7 @@ setattr(__builtin__, '_', lambda x: x)
 
 
 def setup():
+    import mox  # Fail fast if you don't have mox. Workaround for bug 810424
     import os
     import shutil
 
-- 
cgit