Simplify code coverage

neutrons · Jun 21, 2024 · 9e8aadd · 9e8aadd
1 parent edbeba5
commit 9e8aadd
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 108 deletions.
diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml
@@ -22,6 +22,7 @@ jobs:
       LIVE_PLOT_SECRET_KEY: "1234_live_data_server"
       DJANGO_SUPERUSER_USERNAME: livedatauser
       DJANGO_SUPERUSER_PASSWORD: livedatapass
+      COVERAGE_RUN: coverage run -m
     steps:
       - uses: actions/checkout@v4
       - uses: conda-incubator/setup-miniconda@v3
@@ -34,7 +35,7 @@ jobs:
           cache-downloads-key: ${{ runner.os }}-downloads-${{ hashFiles('**/environment.yml') }}
       - name: Start docker containers
         run: |
-          cp ./config/docker-compose.coverage.yml docker-compose.yml
+          cp ./config/docker-compose.envlocal.yml docker-compose.yml
           docker-compose up --build -d
       - name: Sleep, wait for containers to start up
         run: sleep 30

diff --git a/Dockerfile.coverage b/Dockerfile.coverage
diff --git a/config/docker-compose.coverage.yml b/config/docker-compose.coverage.yml
diff --git a/config/docker-compose.envlocal.yml b/config/docker-compose.envlocal.yml
@@ -27,6 +27,7 @@ services:
       DATABASE_HOST: ${DATABASE_HOST}
       DATABASE_PORT: ${DATABASE_PORT}
       LIVE_PLOT_SECRET_KEY: ${LIVE_PLOT_SECRET_KEY}
+      COVERAGE_RUN: ${COVERAGE_RUN}
     command: /usr/bin/docker-entrypoint.sh
     volumes:
       - web-static:/var/www/livedata/static

diff --git a/docker-entrypoint-coverage.sh b/docker-entrypoint-coverage.sh
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
@@ -24,4 +24,4 @@ python manage.py createcachetable webcache
 python manage.py ensure_adminuser --username=${DJANGO_SUPERUSER_USERNAME} --email='[email protected]' --password=${DJANGO_SUPERUSER_PASSWORD}
 
 # run application
-gunicorn live_data_server.wsgi:application -w 2 -b :8000 --reload
+${COVERAGE_RUN} gunicorn live_data_server.wsgi:application -w 2 -b :8000 --reload
diff --git a/src/live_data_server/.coveragerc b/src/live_data_server/.coveragerc
@@ -0,0 +1,4 @@
+[run]
+source=live_data_server,plots
+parallel=True
+relative_files=True