Apend result of the two pytest runs into one coverage report

Author: michael.yak

.github/workflows/python_package_build.yml

@@ -12,19 +12,34 @@ jobs:
     container:
       image: matanrubin/python-poetry:3.7
 
+    env:
+      TEST_REDIS_SERVER: True
+      REDIS_HOST: redis
+
+    services:
+      # User a redis container for testing the redis health-provider
+      redis:
+        image: redis:5.0.3
+
     steps:
       - uses: actions/checkout@v2
       - run: make bootstrap
       - run: poetry build -vvv
+
+      # Install all dependencies except for psutil and run the tests with coverage - this tests handling missing psutil
       - run: poetry install --extras flask --extras fastapi --extras aiohttp --extras db --extras redis
       - run: make coverage
+
+      # Run pylint+mypy after installing psutil so they don't complain on missing dependencies
+      - run: poetry install --extras psutil
+      - run: make check
+
+      # Run tests with coverage again - this adds tests that require psutil
+      - run: make coverage
+
+      # Upload coverage files to codecov
       - uses: actions/upload-artifact@v2
         with:
           name: htmlcov.zip
           path: htmlcov/
       - uses: codecov/codecov-action@v1
-
-      # Install the extra psutil module and run linting+tests in the "psutil enabled" env
-      - run: poetry install --extras psutil
-      - run: make check
-      - run: make test

Makefile

@@ -19,7 +19,7 @@ test:
 	poetry run pytest --log-cli-level=4 -vv tests
 
 coverage:
-	poetry run pytest --cov-report xml:./coverage.xml --cov-report html --cov-report term --cov=pyctuator --log-cli-level=4 -vv tests
+	poetry run pytest --cov-append --cov-report xml:./coverage.xml --cov-report html --cov-report term --cov=pyctuator --log-cli-level=4 -vv tests
 
 pylint:
 	poetry run pylint --exit-zero pyctuator tests

poetry.lock

@@ -19,23 +19,26 @@ def require_redis_server() -> None:
     if not should_test_with_redis:
         pytest.skip("No Redis server (env TEST_REDIS_SERVER isn't True), skipping")
 
+@pytest.fixture
+def redis_host() -> str:
+    return os.getenv("REDIS_HOST", "localhost")
 
 @pytest.mark.usefixtures("require_redis", "require_redis_server")
-def test_redis_health() -> None:
+def test_redis_health(redis_host: str) -> None:
     import redis
     from pyctuator.health.health_provider import Status
     from pyctuator.health.redis_health_provider import RedisHealthProvider, RedisHealthStatus, RedisHealthDetails
 
-    health = RedisHealthProvider(redis.Redis()).get_health()
+    health = RedisHealthProvider(redis.Redis(host=redis_host)).get_health()
     assert health == RedisHealthStatus(Status.UP, RedisHealthDetails("5.0.3", "standalone"))
 
 
 @pytest.mark.usefixtures("require_redis", "require_redis_server")
-def test_redis_bad_password() -> None:
+def test_redis_bad_password(redis_host: str) -> None:
     import redis
     from pyctuator.health.health_provider import Status
     from pyctuator.health.redis_health_provider import RedisHealthProvider
 
-    health = RedisHealthProvider(redis.Redis(password="blabla")).get_health()
+    health = RedisHealthProvider(redis.Redis(host=redis_host, password="blabla")).get_health()
     assert health.status == Status.DOWN
     assert "Client sent AUTH, but no password is set" in str(health.details.failure)