summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-05-29 00:08:49 +0000
committerGerrit Code Review <review@openstack.org>2013-05-29 00:08:49 +0000
commit719d077ed7797954b89c3c69f5a09b5f20fda71f (patch)
treef7c3b16abddad985236f9a4ef7abaade187b1e14
parent3292c5ca0c5328ab426cd217ed7e739740d282ca (diff)
parentd534b290a12235f4e6d9afcbfb9d3aba4486e6cc (diff)
downloadnova-719d077ed7797954b89c3c69f5a09b5f20fda71f.tar.gz
nova-719d077ed7797954b89c3c69f5a09b5f20fda71f.tar.xz
nova-719d077ed7797954b89c3c69f5a09b5f20fda71f.zip
Merge "Fix and enable flake8 F823"
-rw-r--r--nova/tests/test_instance_types.py4
-rw-r--r--tox.ini2
2 files changed, 3 insertions, 3 deletions
diff --git a/nova/tests/test_instance_types.py b/nova/tests/test_instance_types.py
index e20845f1d..d8a915730 100644
--- a/nova/tests/test_instance_types.py
+++ b/nova/tests/test_instance_types.py
@@ -31,8 +31,8 @@ class InstanceTypeTestCase(test.TestCase):
def _generate_name(self):
"""return a name not in the DB."""
nonexistent_flavor = str(int(time.time()))
- flavors = flavors.get_all_types()
- while nonexistent_flavor in flavors:
+ all_flavors = flavors.get_all_types()
+ while nonexistent_flavor in all_flavors:
nonexistent_flavor += "z"
else:
return nonexistent_flavor
diff --git a/tox.ini b/tox.ini
index 218f52b75..44135b88a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,7 +40,7 @@ commands =
commands = {posargs}
[flake8]
-ignore = E12,E711,E712,H302,H303,H403,H404,F403,F811,F823,F841
+ignore = E12,E711,E712,H302,H303,H403,H404,F403,F811,F841
builtins = _
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,plugins,tools