mozilla
/
addons-server
зеркало из https://github.com/mozilla/addons-server.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Added jenkins-es20 to the nose blockage whitelist

This commit is contained in:
Rob Hudson 2013-05-13 11:12:19 -07:00
Родитель d6ccd0d9e1
Коммит c0d2417afe
1 изменённых файлов: 3 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
scripts/run_mkt_tests.sh
Просмотреть файл

@ -5,6 +5,7 @@ cd $WORKSPACE
VENV=$WORKSPACE/venv VENV=$WORKSPACE/venv
VENDOR=$WORKSPACE/vendor VENDOR=$WORKSPACE/vendor
LOCALE=$WORKSPACE/locale LOCALE=$WORKSPACE/locale
ES_HOST='jenkins-es20'
SETTINGS=mkt SETTINGS=mkt
echo "Starting build on executor $EXECUTOR_NUMBER..." `date` echo "Starting build on executor $EXECUTOR_NUMBER..." `date`
@ -79,7 +80,7 @@ CACHES = {
} }
CELERY_ALWAYS_EAGER = True CELERY_ALWAYS_EAGER = True
RUN_ES_TESTS = ${RUN_ES_TESTS} RUN_ES_TESTS = ${RUN_ES_TESTS}
ES_HOSTS = ['jenkins-es20:9200'] ES_HOSTS = ['${ES_HOST}:9200']
ES_URLS = ['http://%s' % h for h in ES_HOSTS] ES_URLS = ['http://%s' % h for h in ES_HOSTS]
ADDONS_PATH = '/tmp/warez' ADDONS_PATH = '/tmp/warez'
STATIC_URL = '' STATIC_URL = ''
@ -95,7 +96,7 @@ python manage.py update_product_details
echo "Starting tests..." `date` echo "Starting tests..." `date`
export FORCE_DB='yes sir' export FORCE_DB='yes sir'
run_tests="python manage.py test -v 2 --noinput --logging-clear-handlers --with-blockage --with-xunit" run_tests="python manage.py test -v 2 --noinput --logging-clear-handlers --with-blockage --http-whitelist=127.0.0.1,localhost,${ES_HOST} --with-xunit"
if [[ $3 = '--with-coverage' ]]; then if [[ $3 = '--with-coverage' ]]; then
run_tests+=" --with-coverage --cover-package=mkt --cover-erase --cover-html --cover-xml --cover-xml-file=coverage.xml" run_tests+=" --with-coverage --cover-package=mkt --cover-erase --cover-html --cover-xml --cover-xml-file=coverage.xml"
else else