heat tests : fix run_tests.sh pep checks

run_tests.sh parses tox.ini, which has been changed removing the
pep8 version, so remove this test and specify the version in
test-requires.  This allows the pep tests to run via run_tests.sh
again, a subsequent patch can reinstate the version check based
on the test-requires version

fixes bug 1131251

Change-Id: Ib24f588cbe81ded768376c138d9d89f5bb311185
This commit is contained in:
Steven Hardy 2013-02-21 15:58:38 +00:00
parent 4476612cad
commit 00a03976fd
2 changed files with 1 additions and 15 deletions

View File

@ -46,20 +46,6 @@ function run_tests {
}
function run_pep8 {
# Check the installed pep8 matches what is in the tox.ini,
# so the local test matches the jenkins gate tests
TOX_PEP_VERSION=$(grep "pep8==" $BASE_DIR/tox.ini | sed "s/.*pep8==//")
INST_PEP_VERSION=$(pep8 --version 2>/dev/null)
if [[ "$TOX_PEP_VERSION" != "$INST_PEP_VERSION" ]]; then
if [[ -z "$INST_PEP_VERSION" ]]; then
echo "ERROR pep8 is not installed, please install pep8 $TOX_PEP_VERSION" >&2
else
echo "ERROR installed version of pep8 $INST_PEP_VERSION" >&2
echo "does not match the required version in tox.ini ($TOX_PEP_VERSION)" >&2
echo "please install the required version of pep8" >&2
fi
exit 1
fi
echo "Running pep8..."
PEP8_OPTIONS="--exclude=$PEP8_EXCLUDE --repeat"
PEP8_INCLUDE="bin/heat-cfn bin/heat-boto bin/heat-api-cfn bin/heat-api bin/heat-engine heat tools setup.py heat/testing/runner.py"

View File

@ -7,7 +7,7 @@ nose
nosexcover
openstack.nose_plugin>=0.7
paramiko
pep8==1.1
pep8==1.3.4
python-glanceclient
sphinx>=1.1.2
Babel