From: John Griffith <john.griffith8@gmail.com>
Date: Wed, 9 Dec 2015 07:03:37 +0000 (-0700)
Subject: Replace use of mox with mock in test_solidfire
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=be4f29cb3a4c1c97c7aa9365f91815d98f504b9c;p=openstack-build%2Fcinder-build.git

Replace use of mox with mock in test_solidfire

Noticed we still had some old usage of mox, replace
the remaining cases of mox with mock in test_solidfire.py

Change-Id: I27c1b4ab04f401765a2ca4eb0ffe4d22da73af4e
---

diff --git a/cinder/tests/unit/test_solidfire.py b/cinder/tests/unit/test_solidfire.py
index 6a6018a17..bf65402e8 100644
--- a/cinder/tests/unit/test_solidfire.py
+++ b/cinder/tests/unit/test_solidfire.py
@@ -17,7 +17,6 @@
 import datetime
 
 import mock
-from mox3 import mox
 from oslo_utils import timeutils
 from oslo_utils import units
 
@@ -31,16 +30,16 @@ from cinder.volume import volume_types
 
 
 def create_configuration():
-    configuration = mox.MockObject(conf.Configuration)
+    configuration = mock.Mock(conf.Configuration)
     configuration.san_is_local = False
-    configuration.append_config_values(mox.IgnoreArg())
+    configuration.append_config_values(mock.IgnoreArg())
     return configuration
 
 
 class SolidFireVolumeTestCase(test.TestCase):
     def setUp(self):
         self.ctxt = context.get_admin_context()
-        self.configuration = mox.MockObject(conf.Configuration)
+        self.configuration = mock.Mock(conf.Configuration)
         self.configuration.sf_allow_tenant_qos = True
         self.configuration.san_is_local = True
         self.configuration.sf_emulate_512 = True