From 42243d6eb221d52bf6f62f835726cbe026e43447 Mon Sep 17 00:00:00 2001
From: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date: Tue, 14 May 2013 11:27:04 +0900
Subject: [PATCH] Fix ./run_tests.sh --pep8

Create a common script to call flake8 to share flake8 options and
make tox and run_tests.sh use this script.

Fixes bug: 1179331

Change-Id: I92dc54fa3f4bb22aa39bde226b6d769088f9a2e3
---
 run_tests.sh      |  9 +--------
 tools/run_pep8.sh | 17 +++++++++++++++++
 tox.ini           | 17 +----------------
 3 files changed, 19 insertions(+), 24 deletions(-)
 create mode 100755 tools/run_pep8.sh

diff --git a/run_tests.sh b/run_tests.sh
index 11a7e48a532..6ddaee62ef1 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -161,14 +161,7 @@ function copy_subunit_log {
 }
 
 function run_pep8 {
-  echo "Running pep8 ..."
-
-  PEP8_EXCLUDE="vcsversion.py,*.pyc,openstack"
-  # we now turn off pep8 1.3 E125 check to avoid make change to
-  # openstack-common .
-  PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --ignore=E125,E711,E712 --repeat --show"
-  PEP8_INCLUDE="bin/* quantum run_tests.py setup*.py"
-  ${wrapper} pep8 $PEP8_OPTIONS $PEP8_INCLUDE
+  bash -c "${wrapper} tools/run_pep8.sh"
 }
 
 
diff --git a/tools/run_pep8.sh b/tools/run_pep8.sh
new file mode 100755
index 00000000000..4c0f789f1bf
--- /dev/null
+++ b/tools/run_pep8.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+echo "Running flake8 ..."
+# E711/E712 comparison to False should be 'if cond is False:' or 'if not cond:'
+#        query = query.filter(Component.disabled == False)
+# E125 continuation line does not distinguish itself from next logical line
+# H301 one import per line
+# H302 import only modules
+# TODO(marun) H404 multi line docstring should start with a summary
+# TODO(marun) H901,902 use the not operator inline for clarity
+# TODO(markmcclain) H202 assertRaises Exception too broad
+PEP8_IGNORE="E711,E712,E125,H301,H302,H404,H901,H902,H202"
+PEP8_BUILTINS="_"
+PEP8_EXCLUDE=".venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools"
+flake8 --exclude=$PEP8_EXCLUDE --ignore=$PEP8_IGNORE --show-source --builtins=$PEP8_BUILTINS .
diff --git a/tox.ini b/tox.ini
index d266c7b253c..fa00a973129 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,8 +15,7 @@ sitepackages = True
 downloadcache = ~/cache/pip
 
 [testenv:pep8]
-commands =
-  flake8
+commands = bash ./tools/run_pep8.sh
 
 [testenv:i18n]
 commands = python ./tools/check_i18n.py ./quantum ./tools/i18n_cfg.py
@@ -28,17 +27,3 @@ commands =
 
 [testenv:venv]
 commands = {posargs}
-
-[flake8]
-# E711/E712 comparison to False should be 'if cond is False:' or 'if not cond:'
-#        query = query.filter(Component.disabled == False)
-# E125 continuation line does not distinguish itself from next logical line
-# H301 one import per line
-# H302 import only modules
-# TODO(marun) H404 multi line docstring should start with a summary
-# TODO(marun) H901,902 use the not operator inline for clarity
-# TODO(markmcclain) H202 assertRaises Exception too broad
-ignore = E711,E712,E125,H301,H302,H404,H901,H902,H202
-show-source = true
-builtins = _
-exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools