Tests: add coverage report

.gitignore

@@ -22,3 +22,7 @@ dist
 # Terraform
 .terraform
 *.tfstate.backup
+
+# Coverage results
+*.coverage
+test/coverage/results/

Makefile

@@ -5,9 +5,13 @@ include vars.mk
 .PHONY: check
 check: environment
 	pipenv run yapf -rd .
+	rm -rf test/coverage/results
+	mkdir test/coverage/results
 	$(MAKE) -C cli check
 	$(MAKE) -C services/controller check
 	BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) python3 test/run.py
+	RUN_WITH_COVERAGE=yes BUILD_TIMESTAMP=$(BUILD_TIMESTAMP) python3 test/run.py
+	pipenv run test/coverage/coverage_report.sh
 	terraform fmt -check
 
 .PHONY: format

Pipfile

@@ -4,6 +4,7 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
+coverage = "*"
 
 [dev-packages]
 yapf = "*"

cli/Dockerfile

@@ -14,7 +14,7 @@ RUN python setup.py bdist_wheel
 FROM python:3.6
 
 COPY --from=builder /cli/dist/plz_cli-0.1.0-py3-none-any.whl /tmp/
-RUN pip install /tmp/plz_cli-0.1.0-py3-none-any.whl
+RUN pip install --find-links /tmp/ plz_cli[test]
 
 ENV PYTHONUNBUFFERED 1
 ENTRYPOINT ["plz"]

cli/Makefile

@@ -5,4 +5,4 @@ check: test lint
 
 .PHONY: test
 test: environment
-	pipenv run nosetests
+	COVERAGE_FILE=../test/coverage/results/cli_nose_tests.coverage pipenv run coverage run --source=. -m nose

cli/Pipfile

@@ -8,9 +8,10 @@ python_version = "3.6"
 
 [packages]
 "e1839a8" = {path = ".", editable = true}
-yapf = "*"
 
 [dev-packages]
 flake8 = "*"
 flask = "*"
 nose = "*"
+coverage = "*"
+yapf = "*"

cli/setup.py

@@ -53,9 +53,10 @@
     ],
     extras_require={
         'test': [
-            'flake8==3.5.0',
-            'nose==1.3.7',
+            'flake8>=3.5.0',
+            'nose>=1.3.7',
             'flask >= 1.0.2',
+            'coverage >= 4.5.3',
         ],
     },
     entry_points={

services/controller/Dockerfile

@@ -26,6 +26,6 @@ ARG BUILD_TIMESTAMP=0
 
 RUN echo -n $BUILD_TIMESTAMP > ./src/plz/controller/BUILD_TIMESTAMP
 
-HEALTHCHECK --interval=5s CMD curl -f http://localhost/
+HEALTHCHECK --interval=5s --start-period=60s CMD curl -f http://localhost/
 
 ENTRYPOINT ["/tini", "--", "./run"]

services/controller/Pipfile

@@ -12,7 +12,8 @@ pyhocon = "*"
 urllib3 = ">=1.24.2"
 redis = "*"
 requests = ">=2.20.0"
-yapf = "*"
 
 [dev-packages]
-"flake8" = "*"
+coverage = "*"
+flake8 = "*"
+yapf = "*"

services/controller/run

@@ -20,12 +20,18 @@ if [[ "${CREATE_AWS_RESOURCES:-}" ]]; then
   python src/plz/controller/utils/create_aws_resources.py
 fi
 
-exec gunicorn \
-  --bind="0.0.0.0:${PORT}" \
-  --workers=16 \
-  --timeout=2000 \
-  --pythonpath="${PYTHONPATH}" \
-  --capture-output \
-  --log-level="${LOG_LEVEL}" \
-  plz.controller.main:app \
-  -- $@
+if [[ "${RUN_WITH_COVERAGE:-}" ]]; then
+  pipenv install --dev --system --deploy
+  COVERAGE_FILE=controller.coverage exec coverage run \
+    --source=. src/plz/controller/main.py
+else
+  exec gunicorn \
+    --bind="0.0.0.0:${PORT}" \
+    --workers=16 \
+    --timeout=2000 \
+    --pythonpath="${PYTHONPATH}" \
+    --capture-output \
+    --log-level="${LOG_LEVEL}" \
+    plz.controller.main:app \
+    -- $@;
+fi

services/controller/src/plz/controller/main.py

@@ -8,6 +8,7 @@
 import requests
 from flask import Flask, Response, abort, jsonify, request, stream_with_context
 
+import plz.controller
 from plz.controller import configuration
 from plz.controller.api.exceptions import AbortedExecutionException, \
     InstanceNotRunningException, JSONResponseException, \
@@ -40,8 +41,7 @@ def _setup_logging():
         print(f'Setting log level to: {log_level}',
               file=sys.stderr,
               flush=True)
-        controller_logger = logging.getLogger('.'.join(
-            __name__.split('.')[:-1]))
+        controller_logger = logging.getLogger(plz.controller.__name__)
         controller_logger.setLevel(log_level)