Removes stubs from unit tests

self.stubs in TestCase and BaseTestCase classes use moxstubout
module which uses mox. OpenStack is moving to python 3 which
will not support mox. This patch removes the use of self.stubs
for all the unit test cases.

Change-Id: I0e5aa50edcbb1913c5143bb93efea965f5d5ebfb

ironic/tests/base.py

@@ -41,7 +41,6 @@ from ironic.db import migration
 from ironic.common import paths
 from ironic.objects import base as objects_base
 from ironic.openstack.common.db.sqlalchemy import session
-from ironic.openstack.common.fixture import moxstubout
 from ironic.openstack.common import log as logging
 from ironic.openstack.common import timeutils
 from ironic.tests import conf_fixture
@@ -176,9 +175,6 @@ class TestCase(testtools.TestCase):
                 objects_base.IronicObject._obj_classes)
         self.addCleanup(self._restore_obj_registry)
 
-        mox_fixture = self.useFixture(moxstubout.MoxStubout())
-        self.mox = mox_fixture.mox
-        self.stubs = mox_fixture.stubs
         self.addCleanup(self._clear_attrs)
         self.useFixture(fixtures.EnvironmentVariable('http_proxy'))
         self.policy = self.useFixture(policy_fixture.PolicyFixture())

ironic/tests/conductor/test_rpcapi.py

@@ -19,6 +19,8 @@
 Unit Tests for :py:class:`ironic.conductor.rpcapi.ConductorAPI`.
 """
 
+import fixtures
+
 from oslo.config import cfg
 
 from ironic.common import states
@@ -27,7 +29,6 @@ from ironic.db import api as dbapi
 from ironic import objects
 from ironic.openstack.common import context
 from ironic.openstack.common import jsonutils as json
-from ironic.openstack.common import rpc
 from ironic.tests.db import base
 from ironic.tests.db import utils as dbutils
 
@@ -71,7 +72,9 @@ class RPCAPITestCase(base.DbTestCase):
             if expected_retval:
                 return expected_retval
 
-        self.stubs.Set(rpc, rpc_method, _fake_rpc_method)
+        self.useFixture(fixtures.MonkeyPatch(
+                "ironic.openstack.common.rpc.%s" % rpc_method,
+                _fake_rpc_method))
 
         retval = getattr(rpcapi, method)(ctxt, **kwargs)
 
@@ -104,7 +107,8 @@ class RPCAPITestCase(base.DbTestCase):
         def _fake_rpc_method(*args, **kwargs):
                 return expected_retval
 
-        self.stubs.Set(rpc, 'call', _fake_rpc_method)
+        self.useFixture(fixtures.MonkeyPatch(
+                'ironic.openstack.common.rpc.call', _fake_rpc_method))
         retval = rpcapi.vendor_passthru(ctxt, node_id=self.fake_node['uuid'],
                                     driver_method='foo', info={'bar': 'baz'})
         self.assertEqual(retval, expected_retval)

ironic/tests/drivers/test_deploy_utils.py

@@ -16,11 +16,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import fixtures
 import mock
 import os
 import tempfile
-import time
-
 
 from ironic.drivers.modules import deploy_utils as utils
 from ironic.tests import base as tests_base
@@ -60,7 +59,7 @@ class PhysicalWorkTestCase(tests_base.TestCase):
         def noop(*args, **kwargs):
             pass
 
-        self.stubs.Set(time, 'sleep', noop)
+        self.useFixture(fixtures.MonkeyPatch('time.sleep', noop))
 
     def test_deploy(self):
         """Check loosely all functions are called with right args."""
@@ -197,7 +196,7 @@ class OtherFunctionTestCase(tests_base.TestCase):
         def fake_getsize(path):
             return size
 
-        self.stubs.Set(os.path, 'getsize', fake_getsize)
+        self.useFixture(fixtures.MonkeyPatch('os.path.getsize', fake_getsize))
         size = 0
         self.assertEqual(utils.get_image_mb('x'), 0)
         size = 1

ironic/tests/drivers/test_pxe.py

@@ -18,6 +18,7 @@
 
 """Test class for PXE driver."""
 
+import fixtures
 import mock
 import os
 import tempfile
@@ -35,7 +36,6 @@ from ironic.common import states
 from ironic.common import utils
 from ironic.conductor import task_manager
 from ironic.db import api as dbapi
-from ironic.drivers.modules import deploy_utils
 from ironic.drivers.modules import pxe
 from ironic.openstack.common import context
 from ironic.openstack.common import fileutils
@@ -517,7 +517,8 @@ class PXEDriverTestCase(db_base.DbTestCase):
         def fake_deploy(**kwargs):
             pass
 
-        self.stubs.Set(deploy_utils, 'deploy', fake_deploy)
+        self.useFixture(fixtures.MonkeyPatch(
+                'ironic.drivers.modules.deploy_utils.deploy', fake_deploy))
         with task_manager.acquire([self.node['uuid']], shared=True) as task:
             task.resources[0].driver.vendor.vendor_passthru(task, self.node,
                     method='pass_deploy_info', address='123456', iqn='aaa-bbb',
@@ -529,7 +530,8 @@ class PXEDriverTestCase(db_base.DbTestCase):
         def fake_deploy(**kwargs):
             raise exception.InstanceDeployFailure()
 
-        self.stubs.Set(deploy_utils, 'deploy', fake_deploy)
+        self.useFixture(fixtures.MonkeyPatch(
+                'ironic.drivers.modules.deploy_utils.deploy', fake_deploy))
         with task_manager.acquire([self.node['uuid']], shared=True) as task:
             self.assertRaises(exception.InstanceDeployFailure,
                             task.resources[0].driver.vendor.vendor_passthru,

ironic/tests/test_images.py

@@ -16,12 +16,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import os
+import fixtures
 
 from ironic.common import exception
 from ironic.common import images
-from ironic.common import utils
-from ironic.openstack.common import fileutils
 from ironic.tests import base
 
 
@@ -60,12 +58,17 @@ class IronicImagesTestCase(base.TestCase):
 
             return FakeImgInfo()
 
-        self.stubs.Set(utils, 'execute', fake_execute)
-        self.stubs.Set(os, 'rename', fake_rename)
-        self.stubs.Set(os, 'unlink', fake_unlink)
-        self.stubs.Set(images, 'fetch', lambda *_: None)
-        self.stubs.Set(images, 'qemu_img_info', fake_qemu_img_info)
-        self.stubs.Set(fileutils, 'delete_if_exists', fake_rm_on_errror)
+        self.useFixture(fixtures.MonkeyPatch(
+                'ironic.common.utils.execute', fake_execute))
+        self.useFixture(fixtures.MonkeyPatch('os.rename', fake_rename))
+        self.useFixture(fixtures.MonkeyPatch('os.unlink', fake_unlink))
+        self.useFixture(fixtures.MonkeyPatch(
+                'ironic.common.images.fetch', lambda *_: None))
+        self.useFixture(fixtures.MonkeyPatch(
+                'ironic.common.images.qemu_img_info', fake_qemu_img_info))
+        self.useFixture(fixtures.MonkeyPatch(
+                'ironic.openstack.common.fileutils.delete_if_exists',
+                fake_rm_on_errror))
 
         context = 'opaque context'
         image_id = '4'