From f3b9d9e7b9a123e55a48393bd07e491ca03bd8f3 Mon Sep 17 00:00:00 2001 From: Sean Dague Date: Mon, 8 Dec 2014 17:38:46 -0500 Subject: [PATCH] fix pep8 errors that apparently slipped in 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 --- nova/tests/unit/compute/test_resources.py | 4 ++-- nova/tests/unit/compute/test_rpcapi.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nova/tests/unit/compute/test_resources.py b/nova/tests/unit/compute/test_resources.py index cdd1585e34d3..2cfd3a6b0aac 100644 --- a/nova/tests/unit/compute/test_resources.py +++ b/nova/tests/unit/compute/test_resources.py @@ -27,7 +27,7 @@ from nova import context from nova.i18n import _ from nova.objects import flavor as flavor_obj from nova import test -from nova.tests.unit.fake_instance import fake_instance_obj +from nova.tests.unit import fake_instance CONF = cfg.CONF @@ -295,7 +295,7 @@ class TestVCPU(test.TestCase): self._vcpu._used = 0 self._flavor = fake_flavor_obj(vcpus=5) 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): # set vcpu values to something different to test reset diff --git a/nova/tests/unit/compute/test_rpcapi.py b/nova/tests/unit/compute/test_rpcapi.py index cc9be4492c61..82d4e2ca3f93 100644 --- a/nova/tests/unit/compute/test_rpcapi.py +++ b/nova/tests/unit/compute/test_rpcapi.py @@ -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 import test 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 @@ -40,7 +40,7 @@ class ComputeRpcAPITestCase(test.TestCase): self.context = context.get_admin_context() instance_attr = {'host': 'fake_host', '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) self.fake_instance = jsonutils.to_primitive(self.fake_instance_obj) self.fake_volume_bdm = jsonutils.to_primitive(