diff options
| author | Rabi Mishra <ramishra@redhat.com> | 2020-05-12 11:11:39 +0530 |
|---|---|---|
| committer | Rabi Mishra <ramishra@redhat.com> | 2020-05-12 11:28:31 +0530 |
| commit | 6d697ad2f0ba74c9396b61ebb18b36613fdb8648 (patch) | |
| tree | 7a2bd4c308e52a1bd5df74e14e32bb7485ad1448 | |
| parent | 4c5abb490922d0d1e923ac6dee630b2767323857 (diff) | |
| download | heat-6d697ad2f0ba74c9396b61ebb18b36613fdb8648.tar.gz | |
Fix pep8 E741 errors
Change-Id: Ibb0da11fd89876602a6da62d08834937b81c2ce6
| -rw-r--r-- | heat/engine/resources/openstack/neutron/l2_gateway.py | 4 | ||||
| -rw-r--r-- | heat/tests/engine/test_dependencies.py | 4 | ||||
| -rw-r--r-- | heat/tests/fakes.py | 2 | ||||
| -rw-r--r-- | heat_integrationtests/common/test.py | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/heat/engine/resources/openstack/neutron/l2_gateway.py b/heat/engine/resources/openstack/neutron/l2_gateway.py index 86ca0c7a9..08f877256 100644 --- a/heat/engine/resources/openstack/neutron/l2_gateway.py +++ b/heat/engine/resources/openstack/neutron/l2_gateway.py @@ -111,8 +111,8 @@ class L2Gateway(neutron.NeutronResource): in props.items() if v is not None) elif (isinstance(props, collections.Sequence) and not isinstance(props, str)): - return list(L2Gateway._remove_none_value_props(l) for l in props - if l is not None) + return list(L2Gateway._remove_none_value_props(p) for p in props + if p is not None) return props @staticmethod diff --git a/heat/tests/engine/test_dependencies.py b/heat/tests/engine/test_dependencies.py index c27e9a14f..7643232d4 100644 --- a/heat/tests/engine/test_dependencies.py +++ b/heat/tests/engine/test_dependencies.py @@ -30,8 +30,8 @@ class dependenciesTest(common.HeatTestCase): self.assertEqual(len(nodes), len(order)) - for l, f in deps: - checkorder(order.index(f), order.index(l)) + for lr, fr in deps: + checkorder(order.index(fr), order.index(lr)) def _dep_test_fwd(self, *deps): def assertLess(a, b): diff --git a/heat/tests/fakes.py b/heat/tests/fakes.py index b2cb29df5..93404e842 100644 --- a/heat/tests/fakes.py +++ b/heat/tests/fakes.py @@ -58,7 +58,7 @@ class FakeClient(object): break if not found: - raise AssertionError('Expected %s %s; got %s' % + raise AssertionError('Expected %s; got %s' % (expected, self.client.callstack)) if body is not None: if entry[2] != body: diff --git a/heat_integrationtests/common/test.py b/heat_integrationtests/common/test.py index afa1ec20d..6c330a23d 100644 --- a/heat_integrationtests/common/test.py +++ b/heat_integrationtests/common/test.py @@ -482,7 +482,7 @@ class HeatIntegrationTest(testscenarios.WithScenarios, def _get_nested_identifier(self, stack_identifier, res_name): rsrc = self.client.resources.get(stack_identifier, res_name) - nested_link = [l for l in rsrc.links if l['rel'] == 'nested'] + nested_link = [lk for lk in rsrc.links if lk['rel'] == 'nested'] nested_href = nested_link[0]['href'] nested_id = nested_href.split('/')[-1] nested_identifier = '/'.join(nested_href.split('/')[-2:]) @@ -524,7 +524,7 @@ class HeatIntegrationTest(testscenarios.WithScenarios, if (filter_func(r) if callable(filter_func) else True)) def get_resource_stack_id(self, r): - stack_link = [l for l in r.links if l.get('rel') == 'stack'][0] + stack_link = [lk for lk in r.links if lk.get('rel') == 'stack'][0] return stack_link['href'].split("/")[-1] def get_physical_resource_id(self, stack_identifier, resource_name): |