diff options
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 4 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py | 2 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py | 4 | ||||
| -rw-r--r-- | nova/tests/network/test_linux_net.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_iptables_network.py | 2 | ||||
| -rwxr-xr-x | run_tests.sh | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
7 files changed, 9 insertions, 9 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 0946d0b19..5977b9ca0 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1146,7 +1146,7 @@ def fixed_ip_disassociate_all_by_timeout(context, host, time): join((models.Network, models.Network.id == models.FixedIp.network_id)).\ join((models.Instance, - models.Instance.uuid == \ + models.Instance.uuid == models.FixedIp.instance_uuid)).\ filter(host_filter).\ all() @@ -4380,7 +4380,7 @@ def _instance_type_extra_specs_get_query(context, flavor_id, subquery() return model_query(context, models.InstanceTypeExtraSpecs, session=session, read_deleted="no").\ - filter(models.InstanceTypeExtraSpecs.\ + filter(models.InstanceTypeExtraSpecs. instance_type_id.in_(t)) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py b/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py index 1dd47aec2..d878e250b 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/089_add_volume_id_mappings.py @@ -82,7 +82,7 @@ def upgrade(migrate_engine): if migrate_engine.name == "mysql": migrate_engine.execute("ALTER TABLE volume_id_mappings Engine=InnoDB") - migrate_engine.execute("ALTER TABLE snapshot_id_mappings "\ + migrate_engine.execute("ALTER TABLE snapshot_id_mappings " "Engine=InnoDB") volumes = Table('volumes', meta, autoload=True) diff --git a/nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py b/nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py index e491e08fe..27ad13e91 100644 --- a/nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py +++ b/nova/db/sqlalchemy/migrate_repo/versions/112_update_deleted_instance_data.py @@ -30,7 +30,7 @@ def upgrade(migrate_engine): meta.bind = migrate_engine instances = Table('instances', meta, autoload=True) - instance_list = list(instances.select().\ + instance_list = list(instances.select(). where(instances.c.deleted == True).execute()) for table_name in TABLES: table = Table(table_name, meta, autoload=True) @@ -55,7 +55,7 @@ def downgrade(migrate_engine): meta.bind = migrate_engine instances = Table('instances', meta, autoload=True) - instance_list = list(instances.select().\ + instance_list = list(instances.select(). where(instances.c.deleted == True).execute()) for table_name in TABLES: table = Table(table_name, meta, autoload=True) diff --git a/nova/tests/network/test_linux_net.py b/nova/tests/network/test_linux_net.py index fd6708343..72bf71674 100644 --- a/nova/tests/network/test_linux_net.py +++ b/nova/tests/network/test_linux_net.py @@ -222,7 +222,7 @@ class LinuxNetworkTestCase(test.TestCase): is_admin=True) def get_vifs(_context, instance_uuid): - return [vif for vif in vifs if vif['instance_uuid'] == \ + return [vif for vif in vifs if vif['instance_uuid'] == instance_uuid] def get_instance(_context, instance_id): diff --git a/nova/tests/test_iptables_network.py b/nova/tests/test_iptables_network.py index 166e28a5c..c8f310303 100644 --- a/nova/tests/test_iptables_network.py +++ b/nova/tests/test_iptables_network.py @@ -97,7 +97,7 @@ class IptablesManagerTestCase(test.TestCase): table.remove_rule('FORWARD', '-s 1.2.3.4/5 -j DROP') new_lines = self.manager._modify_rules(current_lines, table) self.assertTrue('[0:0] -A %s-FORWARD ' - '-s 1.2.3.4/5 -j DROP' % self.binary_name \ + '-s 1.2.3.4/5 -j DROP' % self.binary_name not in new_lines) def test_nat_rules(self): diff --git a/run_tests.sh b/run_tests.sh index 87a5e3b05..9385b4185 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -128,7 +128,7 @@ function run_pep8 { srcfiles+=" setup.py" # Until all these issues get fixed, ignore. - ignore='--ignore=N4,E12,E711,E712,E721,E502' + ignore='--ignore=N4,E12,E711,E721' ${wrapper} python tools/hacking.py ${ignore} ${srcfiles} @@ -24,7 +24,7 @@ downloadcache = ~/cache/pip [testenv:pep8] deps=pep8==1.2 commands = - python tools/hacking.py --ignore=N4,E12,E711,E712,E721,E502 --repeat --show-source \ + python tools/hacking.py --ignore=N4,E12,E711,E721 --repeat --show-source \ --exclude=.venv,.tox,dist,doc,*openstack/common*,*lib/python*,*egg . [testenv:pylint] |