summaryrefslogtreecommitdiffstats
path: root/nova/tests
diff options
context:
space:
mode:
authorBrian Waldon <bcwaldon@gmail.com>2012-05-24 06:56:15 -0700
committerBrian Waldon <bcwaldon@gmail.com>2012-05-24 06:59:05 -0700
commit317378f742aafd59d0aaa6c5698bbda57cbfa15a (patch)
tree6903bc2a95296a592a90372d6b0e6122ad5940e4 /nova/tests
parente3d7d3a805355340f27b9626f83eda329f358fda (diff)
Update pep8 dependency to v1.1
The latest release of pep8 adds stricter rules for extraneous whitespace within lines. This patch also addresses these new violations acoss the codebase. Change-Id: Ib7e50281870473df1704ed50868c5c2e26bdb02e
Diffstat (limited to 'nova/tests')
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_admin_actions.py2
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_disk_config.py2
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py2
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_security_groups.py4
-rw-r--r--nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py18
5 files changed, 14 insertions, 14 deletions
diff --git a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py
index df2a26f86..cc48b7c66 100644
--- a/nova/tests/api/openstack/compute/contrib/test_admin_actions.py
+++ b/nova/tests/api/openstack/compute/contrib/test_admin_actions.py
@@ -17,7 +17,7 @@ import json
import webob
-from nova.api.openstack import compute as compute_api
+from nova.api.openstack import compute as compute_api
from nova import compute
from nova import context
from nova import exception
diff --git a/nova/tests/api/openstack/compute/contrib/test_disk_config.py b/nova/tests/api/openstack/compute/contrib/test_disk_config.py
index c9e4145e4..59ae14ac8 100644
--- a/nova/tests/api/openstack/compute/contrib/test_disk_config.py
+++ b/nova/tests/api/openstack/compute/contrib/test_disk_config.py
@@ -17,7 +17,7 @@
import datetime
-from nova.api.openstack import compute
+from nova.api.openstack import compute
from nova.api.openstack.compute import extensions
from nova.api.openstack import wsgi
import nova.db.api
diff --git a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py b/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py
index 59ad8abbc..b5a3f765a 100644
--- a/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py
+++ b/nova/tests/api/openstack/compute/contrib/test_scheduler_hints.py
@@ -15,7 +15,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from nova.api.openstack import compute
+from nova.api.openstack import compute
from nova.api.openstack.compute import extensions
from nova.api.openstack import wsgi
import nova.db.api
diff --git a/nova/tests/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_security_groups.py
index f864ab648..1778068bb 100644
--- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py
+++ b/nova/tests/api/openstack/compute/contrib/test_security_groups.py
@@ -815,7 +815,7 @@ class TestSecurityGroupRules(test.TestCase):
self.assertRaises(webob.exc.HTTPBadRequest, self.controller.create,
req, {'security_group_rule': rule})
- def _test_create_with_no_ports(self, proto):
+ def _test_create_with_no_ports(self, proto):
rule = {'ip_protocol': proto, 'parent_group_id': '2', 'group_id': '1'}
req = fakes.HTTPRequest.blank('/v2/fake/os-security-group-rules')
@@ -844,7 +844,7 @@ class TestSecurityGroupRules(test.TestCase):
self._test_create_with_no_ports_and_no_group('udp')
self._test_create_with_no_ports('udp')
- def _test_create_with_ports(self, id_val, proto, from_port, to_port):
+ def _test_create_with_ports(self, id_val, proto, from_port, to_port):
rule = {
'ip_protocol': proto, 'from_port': from_port, 'to_port': to_port,
'parent_group_id': '2', 'group_id': '1'
diff --git a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py
index 86c8b5f00..09b59a137 100644
--- a/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py
+++ b/nova/tests/api/openstack/compute/contrib/test_simple_tenant_usage.py
@@ -55,15 +55,15 @@ def fake_instance_type_get(self, context, instance_type_id):
def get_fake_db_instance(start, end, instance_id, tenant_id):
- return {'id': instance_id,
- 'image_ref': '1',
- 'project_id': tenant_id,
- 'user_id': 'fakeuser',
- 'display_name': 'name',
- 'state_description': 'state',
- 'instance_type_id': 1,
- 'launched_at': start,
- 'terminated_at': end}
+ return {'id': instance_id,
+ 'image_ref': '1',
+ 'project_id': tenant_id,
+ 'user_id': 'fakeuser',
+ 'display_name': 'name',
+ 'state_description': 'state',
+ 'instance_type_id': 1,
+ 'launched_at': start,
+ 'terminated_at': end}
def fake_instance_get_active_by_window(self, context, begin, end, project_id):