public
/
ottertune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not check celery status during unit tests

This commit is contained in:
dvanaken 2020-05-15 19:30:22 -04:00 committed by Dana Van Aken
parent 6d854b86ac
commit cd4e1ead62
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -44,9 +44,9 @@ matrix:
- docker-compose -f $dcfile_postgres run --workdir="/app" --no-deps --rm web bash -c "pip3 freeze" - docker-compose -f $dcfile_postgres run --workdir="/app" --no-deps --rm web bash -c "pip3 freeze"
- docker-compose -f $dcfile_postgres run --workdir="/app/controller" --no-deps --rm driver gradle build - docker-compose -f $dcfile_postgres run --workdir="/app/controller" --no-deps --rm driver gradle build
- docker-compose -f $dcfile_postgres run --workdir="/app" --no-deps --rm web bash -c "python3 -m unittest discover -s analysis/tests -v" - docker-compose -f $dcfile_postgres run --workdir="/app" --no-deps --rm web bash -c "python3 -m unittest discover -s analysis/tests -v"
- docker-compose -f $dcfile_postgres run --rm web bash -c "./wait-for-it.sh && python3 manage.py makemigrations website && python3 manage.py test --noinput -v 2" - docker-compose -f $dcfile_postgres run --rm web bash -c "sed -i 's/CHECK_CELERY = True/CHECK_CELERY = False/' website/settings/constants.py && ./wait-for-it.sh && python3 manage.py makemigrations website && python3 manage.py test --noinput -v 2"
- docker-compose -f $dcfile_postgres rm -f -s -v - docker-compose -f $dcfile_postgres rm -f -s -v
- docker-compose -f $dcfile_mysql run --rm web bash -c "./wait-for-it.sh && python3 manage.py makemigrations website && python3 manage.py test --noinput -v 2" - docker-compose -f $dcfile_mysql run --rm web bash -c "sed -i 's/CHECK_CELERY = True/CHECK_CELERY = False/' website/settings/constants.py && ./wait-for-it.sh && python3 manage.py makemigrations website && python3 manage.py test --noinput -v 2"
- docker-compose -f $dcfile_mysql rm -f -s -v - docker-compose -f $dcfile_mysql rm -f -s -v
after_success: true after_success: true
before_deploy: before_deploy:

2
docker/install.sh
View File

@ -43,7 +43,7 @@ then
elif [ "$service" = "web" ] elif [ "$service" = "web" ]
then then
apt_pkgs="python3-dev gcc g++ mysql-client libmysqlclient-dev python-mysqldb postgresql-client" apt_pkgs="python3-dev gcc g++ mysql-client libmysqlclient-dev python-mysqldb postgresql-client telnet"
rm_pkgs="gcc g++" rm_pkgs="gcc g++"