Merge branch 'main' into demos_improve

Author: mwojtyczka

.codegen.json

@@ -7,8 +7,6 @@
     "pre_setup": ["hatch env create"],
     "prepend_path": ".venv/bin",
     "acceptance_path": "tests/integration",
-    "test": [
-      "pytest -n 4 --cov src --cov-report=xml --timeout 30 tests/unit --durations 20"
-    ]
+    "test": []
   }
 }

.github/workflows/acceptance.yml

@@ -42,8 +42,11 @@ jobs:
       - name: Install hatch
         run: pip install hatch==1.9.4
 
-      - name: Run integration tests
-        uses: databrickslabs/sandbox/acceptance@acceptance/v0.4.2
+      - name: Run unit tests and generate test coverage report
+        run: make test
+
+      - name: Run integration tests and generate test coverage report
+        uses: databrickslabs/sandbox/acceptance@acceptance/v0.4.3
         with:
           vault_uri: ${{ secrets.VAULT_URI }}
           timeout: 2h
@@ -52,6 +55,12 @@ jobs:
           ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }}
           ARM_TENANT_ID: ${{ secrets.ARM_TENANT_ID }}
 
+      # collects all coverage reports: coverage.xml from integration tests, coverage-unit.xml from unit tests
+      - name: Publish test coverage
+        uses: codecov/codecov-action@v5
+        with:
+          use_oidc: true
+
   serverless_integration:
     # Only run this job for PRs from branches on the main repository and not from forks.
     # Workflows triggered by PRs from forks don't have access to the tool environment.
@@ -78,7 +87,7 @@ jobs:
         run: pip install hatch==1.9.4
 
       - name: Run integration tests on serverless cluster
-        uses: databrickslabs/sandbox/acceptance@acceptance/v0.4.2
+        uses: databrickslabs/sandbox/acceptance@acceptance/v0.4.3
         with:
           vault_uri: ${{ secrets.VAULT_URI }}
           timeout: 2h

.github/workflows/push.yml

@@ -45,11 +45,6 @@ jobs:
           pip install hatch==1.9.4
           make ci-test
 
-      - name: Publish test coverage
-        uses: codecov/codecov-action@v5
-        with:
-          use_oidc: true
-
   fmt:
     runs-on: ubuntu-latest
     steps:

pyproject.toml

@@ -78,9 +78,9 @@ python="3.10"
 path = ".venv"
 
 [tool.hatch.envs.default.scripts]
-test        = "pytest -n 10 --cov src --cov-report=xml --timeout 30 tests/unit --durations 20"
-coverage    = "pytest -n 10 --cov src tests/ --timeout 480 --cov-report=html --durations 20"
-integration = "pytest -n 10 --timeout 480 --cov src tests/integration --durations 20"
+test        = "pytest tests/unit/ -n 10 --cov --cov-report=xml:coverage-unit.xml --timeout 30 --durations 20"
+coverage    = "pytest tests/ -n 10 --cov --cov-report=html --timeout 480 --durations 20"
+integration = "pytest tests/integration/ -n 10 --cov --cov-report=xml --cov-config=tests/integration/.coveragerc --timeout 480 --durations 20"
 fmt         = ["black . --extend-exclude 'demos/'",
                "ruff check . --fix",
                "mypy . --exclude 'demos/*'",

tests/integration/.coveragerc

@@ -0,0 +1,2 @@
+[run]
+source = src