openstack
/
ironic
Code Issues Proposed changes

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
This commit is contained in:
linggao 2013-10-15 14:50:54 +00:00
parent 7716be1db4
commit 1d9acf39ec
5 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/tests/base.py
View File

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

10
ironic/tests/conductor/test_rpcapi.py
View File

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

7
ironic/tests/drivers/test_deploy_utils.py
View File

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

8
ironic/tests/drivers/test_pxe.py
View File

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

21
ironic/tests/test_images.py
View File

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