diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-24 15:20:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-24 15:20:27 +0000 |
| commit | 9e35b2bbca552b303ab4d478c4174e815eb56600 (patch) | |
| tree | 8933b8096e357161a78c90713be31df552b55363 /nova/tests | |
| parent | df1fb2978c854beb58646406796c2bef2bfb047f (diff) | |
| parent | c39dbb53bcbc0df82d9052248ee8029613858813 (diff) | |
Merge "Fix and enable pep8 E502, E712"
Diffstat (limited to 'nova/tests')
| -rw-r--r-- | nova/tests/network/test_linux_net.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_iptables_network.py | 2 |
2 files changed, 2 insertions, 2 deletions
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): |