summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSandy Walsh <sandy.walsh@rackspace.com>2011-08-05 07:21:55 -0700
committerSandy Walsh <sandy.walsh@rackspace.com>2011-08-05 07:21:55 -0700
commit19e50320e36f02ce11a6aaae8f88a6ddbc132859 (patch)
treeb39c79063273f63bacaa499d003b567fa15f631e
parente3433605d77492a58916d2e131eb0701baf849fa (diff)
pep8 violations sneaking into trunk?
-rw-r--r--nova/db/sqlalchemy/api.py3
-rw-r--r--nova/tests/test_xenapi.py1
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index ce12ba4e0..8cfa94ed7 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -3301,7 +3301,8 @@ def instance_type_extra_specs_delete(context, instance_type_id, key):
@require_context
-def instance_type_extra_specs_get_item(context, instance_type_id, key, session=None):
+def instance_type_extra_specs_get_item(context, instance_type_id, key,
+ session=None):
if not session:
session = get_session()
diff --git a/nova/tests/test_xenapi.py b/nova/tests/test_xenapi.py
index 8048e5341..dfc1eeb0a 100644
--- a/nova/tests/test_xenapi.py
+++ b/nova/tests/test_xenapi.py
@@ -767,7 +767,6 @@ class XenAPIMigrateInstance(test.TestCase):
conn = xenapi_conn.get_connection(False)
conn.migrate_disk_and_power_off(instance, '127.0.0.1')
-
def test_revert_migrate(self):
instance = db.instance_create(self.context, self.values)
self.called = False