OpenConceptLab/ocl_issues#897 Fixing tests

Author: rkorytkowski

Dockerfile

@@ -18,7 +18,7 @@ FROM python:3.9.6-alpine
 
 RUN addgroup -S ocl && adduser -S ocl -G ocl
 
-ENV APP_HOME=/home/ocl/code
+ENV APP_HOME=/code
 
 RUN mkdir -p $APP_HOME
 WORKDIR $APP_HOME
@@ -33,14 +33,10 @@ ADD --chown=ocl:ocl . $APP_HOME
 
 USER ocl
 
-RUN chmod +x set_build_version.sh
+RUN chmod +x set_build_version.sh wait_for_it.sh startup.sh start_celery_worker.sh ping_celery_worker.sh start_flower.sh
+
 RUN ["bash", "-c", "./set_build_version.sh"]
 
-RUN chmod +x wait_for_it.sh
-RUN chmod +x startup.sh
-RUN chmod +x start_celery_worker.sh
-RUN chmod +x ping_celery_worker.sh
-RUN chmod +x start_flower.sh
 EXPOSE 8000
 
 CMD ["bash", "-c", "./startup.sh"]

README.md

@@ -8,9 +8,28 @@ The new and improved OCL terminology service v2
 3. Go to http://localhost:8000/swagger/ to benefit.
 
 #### Run Checks
-1. Pylint (pep8) --- `docker exec -it oclapi2_api_1 pylint -j2 core`
-2. Coverage -- `docker exec -it oclapi2_api_1 bash coverage.sh`
-2. Tests --- `docker exec -it oclapi2_api_1  python manage.py test --keepdb -v3`
+(use the `docker exec` command in a service started with `docker-compose up -d`)
+1. Pylint (pep8):
+   
+   `docker exec -it oclapi2_api_1 pylint -j2 core` 
+
+    or
+
+   `docker-compose -f docker-compose.yml -f docker-compose.ci.yml run --rm api pylint -j0 core`
+2. Coverage
+
+   `docker exec -it oclapi2_api_1 bash coverage.sh`
+
+   or
+
+   `docker-compose -f docker-compose.yml -f docker-compose.ci.yml run --rm api bash coverage.sh`
+3. Tests
+
+    `docker exec -it oclapi2_api_1  python manage.py test --keepdb -v3` 
+
+    or
+
+    `docker-compose -f docker-compose.yml -f docker-compose.ci.yml run --rm api python manage.py test --keepdb -v3`
 
 ### DB migrations
 After modifying model you need to create migration files. Run:

docker-compose.ci.yml

@@ -6,10 +6,6 @@ services:
       - ENVIRONMENT=ci
     volumes:
       - .:/code
-    deploy:
-      resources:
-        limits:
-          memory: 400m
   celery:
     build: .
     volumes:

ping_celery_worker.sh

@@ -6,4 +6,4 @@ CELERY_WORKER_NAME=${CELERY_WORKER_NAME:-""}
 CELERY_WORKER_NAME_WITH_UUID=`cat celery-worker-$CELERY_WORKER_NAME.tmp`
 
 # Providing broker with -b is more efficient than -A as the app does not have to be initialized on each ping
-celery inspect ping -d "celery@$CELERY_WORKER_NAME_WITH_UUID" -b redis://${REDIS_HOST:-localhost}:${REDIS_PORT:-6379}/0
+celery inspect ping -t 10 -d "celery@$CELERY_WORKER_NAME_WITH_UUID" -b redis://${REDIS_HOST:-localhost}:${REDIS_PORT:-6379}/0