diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-14 13:34:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-14 13:34:37 +0000 |
| commit | ca4b1303804e94f10f0e4e6c4a9e09c049efd1ee (patch) | |
| tree | 7a618f5c4f93447febefaf0a092d4a09d668e309 | |
| parent | 414886eafd18f5c1d58f97ab477597207d98acdc (diff) | |
| parent | 73cb9f61607ce1b60df32b8f2297fbc69c21c847 (diff) | |
| download | nova-ca4b1303804e94f10f0e4e6c4a9e09c049efd1ee.tar.gz nova-ca4b1303804e94f10f0e4e6c4a9e09c049efd1ee.tar.xz nova-ca4b1303804e94f10f0e4e6c4a9e09c049efd1ee.zip | |
Merge "Fix pyflakes issues in integrated tests"
| -rw-r--r-- | nova/tests/integrated/test_api_samples.py | 12 | ||||
| -rw-r--r-- | nova/tests/integrated/test_extensions.py | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 0cbc1352b..5bdaa977a 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -28,14 +28,13 @@ from lxml import etree from nova.api.metadata import password from nova.api.openstack.compute.contrib import coverage_ext # Import extensions to pull in osapi_compute_extension CONF option used below. -from nova.api.openstack.compute import extensions from nova.cloudpipe.pipelib import CloudPipe from nova import context from nova import db from nova.db.sqlalchemy import models from nova import exception -from nova.network import api -from nova.network.manager import NetworkManager +from nova.network import api as network_api +from nova.network import manager as network_manager from nova.openstack.common import cfg from nova.openstack.common import importutils from nova.openstack.common import jsonutils @@ -143,7 +142,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): template = self._get_template(name) if self.generate_samples and not os.path.exists(template): - with open(template, 'w') as outf: + with open(template, 'w'): pass with open(template) as inf: return inf.read().strip() @@ -1502,7 +1501,8 @@ class CloudPipeSampleJsonTest(ApiSampleTestBase): 'vpn_public_port': 22} self.stubs.Set(CloudPipe, 'get_encoded_zip', get_user_data) - self.stubs.Set(NetworkManager, "get_network", network_api_get) + self.stubs.Set(network_manager.NetworkManager, "get_network", + network_api_get) def generalize_subs(self, subs, vanilla_regexes): subs['project_id'] = 'cloudpipe-[0-9a-f-]+' @@ -2417,7 +2417,7 @@ class NetworksAssociateJsonTests(ApiSampleTestBase): project=NetworksAssociateJsonTests._sentinel): return True - self.stubs.Set(api.API, "associate", fake_associate) + self.stubs.Set(network_api.API, "associate", fake_associate) def test_disassociate(self): response = self._do_post('os-admin-networks/1/action', diff --git a/nova/tests/integrated/test_extensions.py b/nova/tests/integrated/test_extensions.py index b6e1adc73..ca5ff8374 100644 --- a/nova/tests/integrated/test_extensions.py +++ b/nova/tests/integrated/test_extensions.py @@ -16,7 +16,6 @@ # under the License. # Import extensions to pull in osapi_compute_extension CONF option used below. -from nova.api.openstack.compute import extensions from nova.openstack.common import cfg from nova.openstack.common.log import logging from nova.tests.integrated import integrated_helpers |