From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 1 Apr 2015 06:28:48 +0000 (+0000)
Subject: Merge "Convert all eqlx tests from mox to mock"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=e8652b1e924b3d8eccf00bc8767a77f8637233bb;p=openstack-build%2Fcinder-build.git

Merge "Convert all eqlx tests from mox to mock"
---

e8652b1e924b3d8eccf00bc8767a77f8637233bb
diff --cc cinder/tests/test_eqlx.py
index 32e3d4417,cd341ce38..cb928c6d2
--- a/cinder/tests/test_eqlx.py
+++ b/cinder/tests/test_eqlx.py
@@@ -17,9 -17,7 +17,8 @@@ import tim
  
  from eventlet import greenthread
  import mock
- import mox
  from oslo_concurrency import processutils
 +from oslo_log import log as logging
  import paramiko
  
  from cinder import context