openstack/nova
Code Issues Proposed changes

Refactor run_tests.sh to allow us to run an extra command after the tests.

Browse Source 
Run pep8 after unit tests in run_tests.sh.

Fix setup.py to be PEP-8 compliant.
This commit is contained in:
Soren Hansen 2011-01-19 10:50:54 +01:00
parent b9c96efe7e
commit 50ec058cc7
2 changed files with 39 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
run_tests.sh
View File

@ -31,46 +31,46 @@ always_venv=0
never_venv=0 never_venv=0
force=0 force=0
noseargs= noseargs=
wrapper=""
for arg in "$@"; do for arg in "$@"; do
process_option $arg process_option $arg
done done
function run_tests {
# Just run the test suites in current environment
${wrapper} rm -f nova.sqlite
${wrapper} $NOSETESTS 2> run_tests.err.log
}
NOSETESTS="python run_tests.py $noseargs" NOSETESTS="python run_tests.py $noseargs"
if [ $never_venv -eq 1 ]; then if [ $never_venv -eq 0 ]
# Just run the test suites in current environment then
rm -f nova.sqlite # Remove the virtual environment if --force used
$NOSETESTS 2> run_tests.err.log if [ $force -eq 1 ]; then
exit echo "Cleaning virtualenv..."
fi rm -rf ${venv}
fi
# Remove the virtual environment if --force used if [ -e ${venv} ]; then
if [ $force -eq 1 ]; then wrapper="${with_venv}"
echo "Cleaning virtualenv..."
rm -rf ${venv}
fi
if [ -e ${venv} ]; then
${with_venv} rm -f nova.sqlite
${with_venv} $NOSETESTS 2> run_tests.err.log
else
if [ $always_venv -eq 1 ]; then
# Automatically install the virtualenv
python tools/install_venv.py
else else
echo -e "No virtual environment found...create one? (Y/n) \c" if [ $always_venv -eq 1 ]; then
read use_ve # Automatically install the virtualenv
if [ "x$use_ve" = "xY" -o "x$use_ve" = "x" -o "x$use_ve" = "xy" ]; then
# Install the virtualenv and run the test suite in it
python tools/install_venv.py python tools/install_venv.py
wrapper="${with_venv}"
else else
rm -f nova.sqlite echo -e "No virtual environment found...create one? (Y/n) \c"
$NOSETESTS 2> run_tests.err.log read use_ve
exit if [ "x$use_ve" = "xY" -o "x$use_ve" = "x" -o "x$use_ve" = "xy" ]; then
# Install the virtualenv and run the test suite in it
python tools/install_venv.py
wrapper=${with_venv}
fi
fi fi
fi fi
${with_venv} rm -f nova.sqlite
${with_venv} $NOSETESTS 2> run_tests.err.log
fi fi
run_tests
pep8 --repeat --show-pep8 --show-source bin/* nova setup.py

17
setup.py
View File

@ -41,6 +41,7 @@ class local_BuildDoc(BuildDoc):
self.finalize_options() self.finalize_options()
BuildDoc.run(self) BuildDoc.run(self)
class local_sdist(sdist): class local_sdist(sdist):
"""Customized sdist hook - builds the ChangeLog file from VC first""" """Customized sdist hook - builds the ChangeLog file from VC first"""
@ -57,17 +58,17 @@ class local_sdist(sdist):
changelog_file.write(str_dict_replace(changelog, mailmap)) changelog_file.write(str_dict_replace(changelog, mailmap))
sdist.run(self) sdist.run(self)
nova_cmdclass= { 'sdist': local_sdist, nova_cmdclass = {'sdist': local_sdist,
'build_sphinx' : local_BuildDoc } 'build_sphinx': local_BuildDoc}
try: try:
from babel.messages import frontend as babel from babel.messages import frontend as babel
nova_cmdclass['compile_catalog'] = babel.compile_catalog nova_cmdclass['compile_catalog'] = babel.compile_catalog
nova_cmdclass['extract_messages'] = babel.extract_messages nova_cmdclass['extract_messages'] = babel.extract_messages
nova_cmdclass['init_catalog'] = babel.init_catalog nova_cmdclass['init_catalog'] = babel.init_catalog
nova_cmdclass['update_catalog'] = babel.update_catalog nova_cmdclass['update_catalog'] = babel.update_catalog
except: except:
pass pass
setup(name='nova', setup(name='nova',
version=version.canonical_version_string(), version=version.canonical_version_string(),