diff options
| author | Steven Hardy <shardy@redhat.com> | 2013-02-21 15:58:38 +0000 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2013-02-21 16:14:12 +0000 |
| commit | 00a03976fd5dbf9f9bf39b71de076747be5183d5 (patch) | |
| tree | d68e9d758182310df6a9247d6754330718537710 | |
| parent | 4476612cad192bcbc2faa7cc925b4c2e44f72a67 (diff) | |
| download | heat-00a03976fd5dbf9f9bf39b71de076747be5183d5.tar.gz | |
heat tests : fix run_tests.sh pep checks2013.1.g3
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
| -rwxr-xr-x | run_tests.sh | 14 | ||||
| -rw-r--r-- | tools/test-requires | 2 |
2 files changed, 1 insertions, 15 deletions
diff --git a/run_tests.sh b/run_tests.sh index ff9870a29..feda1934d 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -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" diff --git a/tools/test-requires b/tools/test-requires index 3c096742d..31d534f45 100644 --- a/tools/test-requires +++ b/tools/test-requires @@ -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 |