openstack/nova
Code Issues Proposed changes

fix pep8 errors that apparently slipped in

Browse Source 
Apparently, a couple of H302 issues have slipped into Nova, possibly
due to hacking releases or a bad merge commit. Fix these as they are
blocking some other patches.

Change-Id: Icc42e060492bc74febc9414b63970ee71fb9c27c
This commit is contained in:
Sean Dague
2014-12-08 17:38:46 -05:00
parent e5a231844b
commit f3b9d9e7b9
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nova/tests/unit/compute/test_resources.py
View File

@@ -27,7 +27,7 @@ from nova import context
from nova.i18n import _ from nova.i18n import _
from nova.objects import flavor as flavor_obj from nova.objects import flavor as flavor_obj
from nova import test from nova import test
from nova.tests.unit.fake_instance import fake_instance_obj from nova.tests.unit import fake_instance
CONF = cfg.CONF CONF = cfg.CONF
@@ -295,7 +295,7 @@ class TestVCPU(test.TestCase):
self._vcpu._used = 0 self._vcpu._used = 0
self._flavor = fake_flavor_obj(vcpus=5) self._flavor = fake_flavor_obj(vcpus=5)
self._big_flavor = fake_flavor_obj(vcpus=20) self._big_flavor = fake_flavor_obj(vcpus=20)
self._instance = fake_instance_obj(None) self._instance = fake_instance.fake_instance_obj(None)
def test_reset(self): def test_reset(self):
# set vcpu values to something different to test reset # set vcpu values to something different to test reset

4
nova/tests/unit/compute/test_rpcapi.py
View File

@@ -28,7 +28,7 @@ from nova.objects import block_device as objects_block_dev
from nova.objects import network_request as objects_network_request from nova.objects import network_request as objects_network_request
from nova import test from nova import test
from nova.tests.unit import fake_block_device from nova.tests.unit import fake_block_device
from nova.tests.unit.fake_instance import fake_instance_obj from nova.tests.unit import fake_instance
CONF = cfg.CONF CONF = cfg.CONF
@@ -40,7 +40,7 @@ class ComputeRpcAPITestCase(test.TestCase):
self.context = context.get_admin_context() self.context = context.get_admin_context()
instance_attr = {'host': 'fake_host', instance_attr = {'host': 'fake_host',
'instance_type_id': 1} 'instance_type_id': 1}
self.fake_instance_obj = fake_instance_obj(self.context, self.fake_instance_obj = fake_instance.fake_instance_obj(self.context,
**instance_attr) **instance_attr)
self.fake_instance = jsonutils.to_primitive(self.fake_instance_obj) self.fake_instance = jsonutils.to_primitive(self.fake_instance_obj)
self.fake_volume_bdm = jsonutils.to_primitive( self.fake_volume_bdm = jsonutils.to_primitive(