Add venv wrapper for check_uptodate.sh
tools/conf/check_uptodate.sh is added in run_tests.sh For simple, run "run_tests.sh -p" will call it, and get following error: Failed to collect options from module cinder.volume.drivers.san.hp.hp_3par_common: No module named hp3parclient Actually, the hp3parclient is listed in test-requirements.txt, and it is installed in venv. the check_uptodate.sh should run in venv to get correct result. update the error message to update the cindier.conf.sample correctly. ----------- Test method ----------- $ pwd /opt/stack/cinder $ source .venv/bin/activate; tools/conf/generate_sample.sh (.venv)$ deactivate $ ./run_tests.sh -p Running flake8 ... // no error emitted here Fixes Bug #1219197 Change-Id: I9b3eaf3c1a5eb395eefed28bb907685cdef147aa
This commit is contained in:
parent
3e69b7ce2e
commit
91e2466f2d
@ -227,7 +227,7 @@ fi
|
|||||||
|
|
||||||
if [ $just_pep8 -eq 1 ]; then
|
if [ $just_pep8 -eq 1 ]; then
|
||||||
run_pep8
|
run_pep8
|
||||||
bash ./tools/conf/check_uptodate.sh
|
${wrapper} bash ./tools/conf/check_uptodate.sh
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -245,6 +245,6 @@ run_tests
|
|||||||
if [ -z "$testrargs" ]; then
|
if [ -z "$testrargs" ]; then
|
||||||
if [ $no_pep8 -eq 0 ]; then
|
if [ $no_pep8 -eq 0 ]; then
|
||||||
run_pep8
|
run_pep8
|
||||||
bash ./tools/conf/check_uptodate.sh
|
${wrapper} bash ./tools/conf/check_uptodate.sh
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -4,7 +4,8 @@ CFGFILE=cinder.conf.sample
|
|||||||
tools/conf/generate_sample.sh -o $TEMPDIR
|
tools/conf/generate_sample.sh -o $TEMPDIR
|
||||||
if ! diff $TEMPDIR/$CFGFILE etc/cinder/$CFGFILE
|
if ! diff $TEMPDIR/$CFGFILE etc/cinder/$CFGFILE
|
||||||
then
|
then
|
||||||
echo "E: cinder.conf.sample is not up to date, please run tools/conf/generate_sample.sh"
|
echo "E: cinder.conf.sample is not up to date, please run tools/conf/generate_sample.sh in venv"
|
||||||
|
echo "E: e.g. \$ source .venv/bin/activate; tools/conf/generate_sample.sh"
|
||||||
rm -rf $TEMPDIR
|
rm -rf $TEMPDIR
|
||||||
exit 42
|
exit 42
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user