diff --git a/VERSION b/VERSION index 678d82531e71b3d344f7479e2dd738034de0088d_VkVSU0lPTg==..b029ddbeabcfd6701b1bb42edb3f01861b207ab4_VkVSU0lPTg== 100644 --- a/VERSION +++ b/VERSION @@ -1,1 +1,1 @@ -2.5 +2.6 diff --git a/do_tests b/do_tests index 678d82531e71b3d344f7479e2dd738034de0088d_ZG9fdGVzdHM=..b029ddbeabcfd6701b1bb42edb3f01861b207ab4_ZG9fdGVzdHM= 100755 --- a/do_tests +++ b/do_tests @@ -13,7 +13,7 @@ # # - access to pg database # -# Version 2.5 +# Version 2.6 here=$(dirname $0) project_home=$(cd $here && cd .. && echo $PWD) dbname=$(basename $project_home)_test @@ -70,5 +70,4 @@ echo ${YELLOW}INFO ${RESET} - Modules to install: $modules_to_install echo ${YELLOW}INFO ${RESET} - Install those modules $here/start -i $modules_to_install -d $dbname --log-level=warn --max-cron=0 --stop-after-init $ODOO_HOST $ODOO_USER || { echo ${RED}FATAL${RESET} - Cannot install modules ; exit 1; } -logfile=$(tempfile --suffix=.log) echo ${YELLOW}INFO ${RESET} - Run tests on $dbname @@ -74,24 +73,2 @@ echo ${YELLOW}INFO ${RESET} - Run tests on $dbname -$here/run_tests $dbname $ODOO_HOST $ODOO_USER | tee $logfile -ok=$(grep ' OK' $logfile -c) -failed=$(grep ' FAILED' $logfile -c) -echo '' -echo '***** Test results *****' -echo "$ok modules passing, $failed modules failing" -echo '' -if [[ $ok -gt 0 ]]; -then - echo '\tOK:' - grep ' OK' $logfile || true -fi -if [[ $failed -gt 0 ]]; -then - echo '\tFAILED:' - grep FAILED $logfile -fi -echo '' -rm $logfile -if [[ $failed -gt 0 ]]; -then - exit 1 -fi +$here/run_tests $dbname $ODOO_HOST $ODOO_USER diff --git a/docker_build b/docker_build index 678d82531e71b3d344f7479e2dd738034de0088d_ZG9ja2VyX2J1aWxk..b029ddbeabcfd6701b1bb42edb3f01861b207ab4_ZG9ja2VyX2J1aWxk 100755 --- a/docker_build +++ b/docker_build @@ -1,5 +1,5 @@ #!/bin/zsh -# template version 2.5 +# template version 2.6 # TODO add a way to bypass the value, maybe with a key in the setup.cfg file repository=dockerhub.xcg.io diff --git a/run_tests b/run_tests index 678d82531e71b3d344f7479e2dd738034de0088d_cnVuX3Rlc3Rz..b029ddbeabcfd6701b1bb42edb3f01861b207ab4_cnVuX3Rlc3Rz 100755 --- a/run_tests +++ b/run_tests @@ -4,7 +4,7 @@ # This script is used to run tests on a database with demo data installed. # # Either provide the name of the database (first argument) or it will default to <project>_test -# Version 2.5 +# Version 2.6 here=$(dirname $0) project_home=$(cd $here && cd .. && echo $PWD) tested_modules=$(python -B -c "import ConfigParser ; c = ConfigParser.ConfigParser() ; c.read('${project_home}/setup.cfg') ; print ','.join(c.get('odoo_scripts', 'module_list_tests', '').split())") @@ -28,4 +28,27 @@ else loglevel="--log-level=test" fi -$here/start $update -d $dbname --test-enable $loglevel --max-cron=0 --stop-after-init $* +logfile=$(tempfile --suffix=.log) +$here/start $update -d $dbname --test-enable $loglevel --max-cron=0 --stop-after-init $* | tee $logfile +ok=$(grep ' OK' $logfile -c) +failed=$(grep ' FAILED' $logfile -c) +echo '' +echo '***** Test results *****' +echo "$ok modules passing, $failed modules failing" +echo '' +if [[ $ok -gt 0 ]]; +then + echo '\tOK:' + grep ' OK' $logfile || true +fi +if [[ $failed -gt 0 ]]; +then + echo '\tFAILED:' + grep FAILED $logfile +fi +echo '' +rm $logfile +if [[ $failed -gt 0 ]]; +then + exit 1 +fi diff --git a/setup.cfg b/setup.cfg index 678d82531e71b3d344f7479e2dd738034de0088d_c2V0dXAuY2Zn..b029ddbeabcfd6701b1bb42edb3f01861b207ab4_c2V0dXAuY2Zn 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.5 +current_version = 2.6 parse = (?P<major>\d+)\.(?P<minor>\d+) serialize = {major}.{minor} diff --git a/start b/start index 678d82531e71b3d344f7479e2dd738034de0088d_c3RhcnQ=..b029ddbeabcfd6701b1bb42edb3f01861b207ab4_c3RhcnQ= 100755 --- a/start +++ b/start @@ -5,7 +5,7 @@ # # You can set ODOO_DATA_DIR and ODOO_DB_HOST if you want to avoid using the default value ($HOME/var/tmp and localhost) # -# Version 2.5 +# Version 2.6 here=$(dirname $0) project_home=$(cd $here && cd .. && echo $PWD) echo "Starting odoo for development"