openstack
/
nova
Code Issues Proposed changes

Remove unnecessary variables from tests 

Change-Id: Id83ea12ee89ee6511277aa2f0929f9bedb8f638b
This commit is contained in:
Johannes Erdfelt 2012-03-01 23:01:34 +00:00
parent d65a4e4023
commit 2034692653
27 changed files with 3 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nova/tests/api/ec2/test_cloud.py
View File

@ -100,7 +100,6 @@ class CloudTestCase(test.TestCase):
self.scheduler = self.start_service('scheduler')
self.network = self.start_service('network')
self.volume = self.start_service('volume')
self.image_service = utils.import_object(FLAGS.image_service)
self.user_id = 'fake'
self.project_id = 'fake'

2
nova/tests/api/openstack/compute/contrib/test_admin_actions.py
View File

@ -92,7 +92,6 @@ class AdminActionsTest(test.TestCase):
fake_scheduler_api_live_migration)
def test_admin_api_actions(self):
self.maxDiff = None
app = fakes.wsgi_app()
for _action in self._actions:
req = webob.Request.blank('/v2/fake/servers/%s/action' %
@ -104,7 +103,6 @@ class AdminActionsTest(test.TestCase):
self.assertEqual(res.status_int, 202)
def test_admin_api_actions_raise_conflict_on_invalid_state(self):
self.maxDiff = None
app = fakes.wsgi_app()
for _action, _method in self._actions_that_check_state:

3
nova/tests/api/openstack/compute/contrib/test_keypairs.py
View File

@ -20,7 +20,6 @@ from lxml import etree
from nova.api.openstack import wsgi
from nova.api.openstack.compute.contrib import keypairs
from nova import context
from nova import db
from nova import exception
from nova import test
@ -54,7 +53,6 @@ class KeypairsTest(test.TestCase):
def setUp(self):
super(KeypairsTest, self).setUp()
self.controller = keypairs.KeypairController()
fakes.stub_out_networking(self.stubs)
fakes.stub_out_rate_limiting(self.stubs)
self.stubs.Set(db, "key_pair_get_all_by_user",
@ -63,7 +61,6 @@ class KeypairsTest(test.TestCase):
db_key_pair_create)
self.stubs.Set(db, "key_pair_destroy",
db_key_pair_destroy)
self.context = context.get_admin_context()
def test_keypair_list(self):
req = webob.Request.blank('/v2/fake/os-keypairs')

2
nova/tests/api/openstack/compute/contrib/test_multinic_xs.py
View File

@ -18,7 +18,6 @@ import json
import webob
from nova import compute
from nova import context
from nova import test
from nova.tests.api.openstack import fakes
@ -54,7 +53,6 @@ class FixedIpTest(test.TestCase):
self.stubs.Set(compute.api.API, "remove_fixed_ip",
compute_api_remove_fixed_ip)
self.stubs.Set(compute.api.API, 'get', compute_api_get)
self.context = context.get_admin_context()
def test_add_fixed_ip(self):
global last_add_fixed_ip

2
nova/tests/api/openstack/compute/contrib/test_networks.py
View File

@ -19,7 +19,6 @@ import copy
import webob
from nova.api.openstack.compute.contrib import networks
from nova import context
from nova import exception
from nova import test
from nova.tests.api.openstack import fakes
@ -96,7 +95,6 @@ class NetworksTest(test.TestCase):
self.controller = networks.NetworkController(self.fake_network_api)
fakes.stub_out_networking(self.stubs)
fakes.stub_out_rate_limiting(self.stubs)
self.context = context.RequestContext('user', '1234', is_admin=True)
def test_network_list_all(self):
req = fakes.HTTPRequest.blank('/v2/1234/os-networks')

8
nova/tests/api/openstack/compute/contrib/test_quotas.py
View File

@ -20,7 +20,6 @@ from lxml import etree
from nova.api.openstack import wsgi
from nova.api.openstack.compute.contrib import quotas
from nova import context
from nova import test
from nova.tests.api.openstack import fakes
@ -42,13 +41,6 @@ class QuotaSetsTest(test.TestCase):
def setUp(self):
super(QuotaSetsTest, self).setUp()
self.controller = quotas.QuotaSetsController()
self.user_id = 'fake'
self.project_id = 'fake'
self.user_context = context.RequestContext(self.user_id,
self.project_id)
self.admin_context = context.RequestContext(self.user_id,
self.project_id,
is_admin=True)
def test_format_quota_set(self):
raw_quota_set = {

3
nova/tests/api/openstack/compute/contrib/test_server_action_list.py
View File

@ -19,7 +19,7 @@ import unittest
from lxml import etree
from nova.api.openstack import compute
from nova.api.openstack import compute
from nova.api.openstack.compute import extensions
from nova.api.openstack.compute.contrib import server_action_list
from nova.api.openstack import wsgi
@ -50,7 +50,6 @@ class ServerActionsTest(test.TestCase):
self.flags(verbose=True)
self.stubs.Set(nova.compute.API, 'get_actions', fake_get_actions)
self.stubs.Set(nova.compute.API, 'get', fake_instance_get)
self.compute_api = nova.compute.API()
self.router = compute.APIRouter()

3
nova/tests/api/openstack/compute/contrib/test_server_diagnostics.py
View File

@ -18,7 +18,7 @@ import unittest
from lxml import etree
from nova.api.openstack import compute
from nova.api.openstack import compute
from nova.api.openstack.compute import extensions
from nova.api.openstack.compute.contrib import server_diagnostics
from nova.api.openstack import wsgi
@ -44,7 +44,6 @@ class ServerDiagnosticsTest(test.TestCase):
self.stubs.Set(nova.compute.API, 'get_diagnostics',
fake_get_diagnostics)
self.stubs.Set(nova.compute.API, 'get', fake_instance_get)
self.compute_api = nova.compute.API()
self.router = compute.APIRouter()

2
nova/tests/api/openstack/compute/contrib/test_server_start_stop.py
View File

@ -18,7 +18,6 @@ import mox
import webob
from nova.api.openstack.compute.contrib import server_start_stop
from nova import context
from nova import compute
from nova import test
from nova.tests.api.openstack import fakes
@ -32,7 +31,6 @@ class ServerStartStopTest(test.TestCase):
def setUp(self):
super(ServerStartStopTest, self).setUp()
self.context = context.get_admin_context()
self.controller = server_start_stop.ServerStartStopActionController()
def tearDown(self):

1
nova/tests/api/openstack/compute/contrib/test_virtual_interfaces.py
View File

@ -44,7 +44,6 @@ class ServerVirtualInterfaceTest(test.TestCase):
def setUp(self):
super(ServerVirtualInterfaceTest, self).setUp()
self.controller = virtual_interfaces.ServerVirtualInterfaceController()
self.stubs.Set(compute.api.API, "get",
compute_api_get)
self.stubs.Set(network.api.API, "get_vifs_by_instance",

4
nova/tests/api/openstack/compute/contrib/test_vsa.py
View File

@ -21,7 +21,6 @@ import webob
from nova.api.openstack.compute.contrib import (virtual_storage_arrays as
vsa_ext)
from nova import context
import nova.db
from nova import exception
from nova import flags
@ -105,8 +104,6 @@ class VSAApiTest(test.TestCase):
self.stubs.Set(vsa.api.API, "get", stub_vsa_get)
self.stubs.Set(vsa.api.API, "get_all", stub_vsa_get_all)
self.context = context.get_admin_context()
def tearDown(self):
super(VSAApiTest, self).tearDown()
@ -253,7 +250,6 @@ class VSAVolumeApiTest(test.TestCase):
self.stubs.Set(volume.api.API, "get", fakes.stub_volume_get)
self.stubs.Set(volume.api.API, "get_all", fakes.stub_volume_get_all)
self.context = context.get_admin_context()
self.test_obj = test_obj if test_obj else "volume"
self.test_objs = test_objs if test_objs else "volumes"

1
nova/tests/api/openstack/compute/test_flavors.py
View File

@ -335,7 +335,6 @@ class FlavorsTest(test.TestCase):
def test_get_flavor_list_filter_min_ram(self):
"""Flavor lists may be filtered by minRam"""
self.maxDiff = None
req = fakes.HTTPRequest.blank('/v2/fake/flavors?minRam=512')
flavor = self.controller.index(req)
expected = {

1
nova/tests/api/openstack/compute/test_images.py
View File

@ -51,7 +51,6 @@ class ImagesControllerTest(test.TestCase):
def setUp(self):
"""Run before each test."""
super(ImagesControllerTest, self).setUp()
self.maxDiff = None
self.stubs = stubout.StubOutForTesting()
fakes.stub_out_networking(self.stubs)
fakes.stub_out_rate_limiting(self.stubs)

7
nova/tests/api/openstack/compute/test_limits.py
View File

@ -82,7 +82,6 @@ class LimitsControllerTest(BaseLimitTestSuite):
"""Run before each test."""
BaseLimitTestSuite.setUp(self)
self.controller = limits.create_resource()
self.maxDiff = None
def _get_index_request(self, accept_header="application/json"):
"""Helper to set routing arguments."""
@ -849,12 +848,6 @@ class LimitsViewBuilderTest(test.TestCase):
class LimitsXMLSerializationTest(test.TestCase):
def setUp(self):
self.maxDiff = None
def tearDown(self):
pass
def test_xml_declaration(self):
serializer = limits.LimitsTemplate()

3
nova/tests/api/openstack/compute/test_server_actions.py
View File

@ -21,7 +21,6 @@ import webob
from nova.api.openstack.compute import servers
from nova.compute import vm_states
from nova import context
import nova.db
from nova import exception
from nova import flags
@ -55,7 +54,6 @@ class MockSetAdminPassword(object):
class ServerActionsControllerTest(test.TestCase):
def setUp(self):
self.maxDiff = None
super(ServerActionsControllerTest, self).setUp()
self.stubs = stubout.StubOutForTesting()
@ -72,7 +70,6 @@ class ServerActionsControllerTest(test.TestCase):
fakes.stub_out_image_service(self.stubs)
service_class = 'nova.image.glance.GlanceImageService'
self.service = utils.import_object(service_class)
self.context = context.RequestContext(1, None)
self.service.delete_all()
self.sent_to_glance = {}
fakes.stub_out_glance_add_image(self.stubs, self.sent_to_glance)

14
nova/tests/api/openstack/compute/test_servers.py
View File

@ -91,7 +91,6 @@ class MockSetAdminPassword(object):
class ServersControllerTest(test.TestCase):
def setUp(self):
self.maxDiff = None
super(ServersControllerTest, self).setUp()
self.flags(verbose=True, use_ipv6=False)
fakes.stub_out_rate_limiting(self.stubs)
@ -109,8 +108,6 @@ class ServersControllerTest(test.TestCase):
return_security_group)
self.stubs.Set(nova.db, 'instance_update', instance_update)
self.config_drive = None
self.controller = servers.Controller()
self.ips_controller = ips.Controller()
@ -1200,10 +1197,8 @@ class ServersControllerCreateTest(test.TestCase):
"""Shared implementation for tests below that create instance"""
super(ServersControllerCreateTest, self).setUp()
self.maxDiff = None
self.flags(verbose=True,
enable_instance_password=True)
self.config_drive = None
self.instance_cache_num = 0
self.instance_cache = {}
@ -1227,7 +1222,7 @@ class ServersControllerCreateTest(test.TestCase):
'reservation_id': inst['reservation_id'],
"created_at": datetime.datetime(2010, 10, 10, 12, 0, 0),
"updated_at": datetime.datetime(2010, 11, 11, 11, 0, 0),
"config_drive": self.config_drive,
"config_drive": None,
"progress": 0,
"fixed_ips": []
}
@ -1778,7 +1773,6 @@ class ServersControllerCreateTest(test.TestCase):
self.controller.create, req, body)
def test_create_instance_with_config_drive(self):
self.config_drive = True
image_href = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
flavor_ref = 'http://localhost/v2/fake/flavors/3'
body = {
@ -1805,7 +1799,6 @@ class ServersControllerCreateTest(test.TestCase):
self.assertEqual(FAKE_UUID, server['id'])
def test_create_instance_with_config_drive_as_id(self):
self.config_drive = 2
image_href = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
flavor_ref = 'http://localhost/v2/fake/flavors/3'
body = {
@ -1832,7 +1825,6 @@ class ServersControllerCreateTest(test.TestCase):
self.assertEqual(FAKE_UUID, server['id'])
def test_create_instance_with_bad_config_drive(self):
self.config_drive = "asdf"
image_href = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
flavor_ref = 'http://localhost/v2/fake/flavors/3'
body = {
@ -3033,10 +3025,6 @@ class ServerXMLSerializationTest(test.TestCase):
IMAGE_BOOKMARK = 'http://localhost/images/5'
FLAVOR_BOOKMARK = 'http://localhost/flavors/1'
def setUp(self):
self.maxDiff = None
test.TestCase.setUp(self)
def test_xml_declaration(self):
serializer = servers.ServerTemplate()

2
nova/tests/api/openstack/compute/test_versions.py
View File

@ -25,7 +25,6 @@ import webob
from nova.api.openstack.compute import versions
from nova.api.openstack.compute import views
from nova.api.openstack import xmlutil
from nova import context
from nova import test
from nova.tests.api.openstack import common
from nova.tests.api.openstack import fakes
@ -82,7 +81,6 @@ VERSIONS = {
class VersionsTest(test.TestCase):
def setUp(self):
super(VersionsTest, self).setUp()
self.context = context.get_admin_context()
self.stubs = stubout.StubOutForTesting()
fakes.stub_out_auth(self.stubs)
#Stub out VERSIONS

2
nova/tests/baremetal/test_proxy_bare_metal.py
View File

@ -24,7 +24,6 @@ from nova import flags
from nova import utils
from nova import test
from nova.compute import power_state
from nova import context
from nova.tests import fake_utils
from nova import exception
@ -265,7 +264,6 @@ class ProxyBareMetalTestCase(test.TestCase):
def setUp(self):
super(ProxyBareMetalTestCase, self).setUp()
self.flags(baremetal_driver='fake')
self.context = context.get_admin_context()
fake_utils.stub_out_utils_execute(self.stubs)
def test_get_info(self):

2
nova/tests/test_SolidFireSanISCSIDriver.py
View File

@ -26,8 +26,6 @@ LOG = logging.getLogger(__name__)
class SolidFireVolumeTestCase(test.TestCase):
def setUp(self):
super(SolidFireVolumeTestCase, self).setUp()
self.executes = []
self.account_not_found = False
def tearDown(self):
pass

1
nova/tests/test_access.py
View File

@ -47,7 +47,6 @@ class AccessTestCase(test.TestCase):
def setUp(self):
super(AccessTestCase, self).setUp()
um = manager.AuthManager()
self.context = context.get_admin_context()
# Make test users
self.testadmin = um.create_user('testadmin')
self.testpmsys = um.create_user('testpmsys')

3
nova/tests/test_compute.py
View File

@ -121,7 +121,6 @@ class BaseTestCase(test.TestCase):
self.project_id)
test_notifier.NOTIFICATIONS = []
self.mox = mox.Mox()
self.total_waits = 0
def fake_show(meh, context, id):
return {'id': 1, 'min_disk': None, 'min_ram': None,
@ -2582,7 +2581,6 @@ class ComputeAPITestCase(BaseTestCase):
def test_get(self):
"""Test get instance"""
self.maxDiff = None
c = context.get_admin_context()
exp_instance = self._create_fake_instance()
expected = dict(exp_instance.iteritems())
@ -2598,7 +2596,6 @@ class ComputeAPITestCase(BaseTestCase):
def test_get_with_integer_id(self):
"""Test get instance with an integer id"""
self.maxDiff = None
c = context.get_admin_context()
exp_instance = self._create_fake_instance()
expected = dict(exp_instance.iteritems())

4
nova/tests/test_libvirt.py
View File

@ -349,8 +349,6 @@ class LibvirtConnTestCase(test.TestCase):
self.flags(fake_call=True)
self.user_id = 'fake'
self.project_id = 'fake'
self.context = context.RequestContext(self.user_id, self.project_id)
self.network = utils.import_object(FLAGS.network_manager)
self.context = context.get_admin_context()
self.flags(instances_path='')
self.call_libvirt_dependant_setup = False
@ -1368,7 +1366,6 @@ class IptablesFirewallTestCase(test.TestCase):
self.user_id = 'fake'
self.project_id = 'fake'
self.context = context.RequestContext(self.user_id, self.project_id)
self.network = utils.import_object(FLAGS.network_manager)
class FakeLibvirtConnection(object):
def nwfilterDefineXML(*args, **kwargs):
@ -2046,7 +2043,6 @@ class LibvirtConnectionTestCase(test.TestCase):
self.libvirtconnection = connection.LibvirtConnection(read_only=True)
self.platform = sys.platform
self.exe_flag = False
self.temp_path = os.path.join(flags.FLAGS.instances_path,
'instance-00000001/', '')

1
nova/tests/test_log.py
View File

@ -82,7 +82,6 @@ class PublishErrorsHandlerTestCase(test.TestCase):
"""Tests for nova.log.PublishErrorsHandler"""
def setUp(self):
super(PublishErrorsHandlerTestCase, self).setUp()
self.handler = logging.Handler()
self.publiserrorshandler = log.PublishErrorsHandler(logging.ERROR)
def test_emit_cfg_list_notifier_drivers_in_flags(self):

1
nova/tests/test_nova_manage.py
View File

@ -80,7 +80,6 @@ class NetworkCommandsTestCase(test.TestCase):
super(NetworkCommandsTestCase, self).setUp()
self.stubs = stubout.StubOutForTesting()
self.commands = nova_manage.NetworkCommands()
self.context = context.get_admin_context()
self.net = {'id': 0,
'label': 'fake',
'injected': False,

2
nova/tests/test_vmwareapi.py
View File

@ -23,7 +23,6 @@ from nova import context
from nova import db
from nova import flags
from nova import test
from nova import utils
from nova.compute import power_state
from nova.tests.glance import stubs as glance_stubs
from nova.tests.vmwareapi import db_fakes
@ -47,7 +46,6 @@ class VMWareAPIVMTestCase(test.TestCase):
self.user_id = 'fake'
self.project_id = 'fake'
self.context = context.RequestContext(self.user_id, self.project_id)
self.network = utils.import_object(FLAGS.network_manager)
vmwareapi_fake.reset()
db_fakes.stub_out_db_instance_api(self.stubs)
stubs.set_stubs(self.stubs)

1
nova/tests/test_volume.py
View File

@ -438,7 +438,6 @@ class VolumePolicyTestCase(test.TestCase):
nova.policy.init()
self.context = context.get_admin_context()
self.volume_api = nova.volume.api.API()
def tearDown(self):
super(VolumePolicyTestCase, self).tearDown()

2
nova/tests/test_volume_types.py
View File

@ -44,8 +44,6 @@ class VolumeTypeTestCase(test.TestCase):
size="300",
rpm="7200",
visible="True")
self.vol_type1 = dict(name=self.vol_type1_name,
extra_specs=self.vol_type1_specs)
def test_volume_type_create_then_destroy(self):
"""Ensure volume types can be created and deleted"""