Skip to content

Commit 1ed06b2

Browse files
committed
CCM-12616: fix sonarcloud coverage issues
1 parent e07f431 commit 1ed06b2

File tree

9 files changed

+31
-20
lines changed

9 files changed

+31
-20
lines changed

lambdas/mesh-download/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ test:
1414
poetry run pytest
1515

1616
coverage:
17-
poetry run pytest src/__tests__/ \
18-
--cov=src \
19-
--cov-report=html:htmlcov \
17+
cd ../.. && COVERAGE_RCFILE=lambdas/mesh-download/pyproject.toml \
18+
poetry -C lambdas/mesh-download run pytest lambdas/mesh-download/src/__tests__/ \
19+
--cov=lambdas/mesh-download/src \
20+
--cov-report=html:lambdas/mesh-download/htmlcov \
2021
--cov-report=term-missing \
21-
--cov-report=xml:coverage.xml \
22+
--cov-report=xml:lambdas/mesh-download/coverage.xml \
2223
--cov-branch
2324

2425
lint:

lambdas/mesh-download/pyproject.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ pytest = "^7.0.1"
2929
pytest-cov = "^4.0.0"
3030

3131
[tool.coverage.run]
32-
source = ["src"]
32+
relative_files = true
33+
source = ["lambdas/mesh-download/src"]
34+
omit = ["*/__tests__/*"]
3335

3436
[build-system]
3537
requires = ["poetry-core"]

lambdas/mesh-poll/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ test:
1414
poetry run pytest
1515

1616
coverage:
17-
poetry run pytest src/__tests__/ \
18-
--cov=src \
19-
--cov-report=html:htmlcov \
17+
cd ../.. && COVERAGE_RCFILE=lambdas/mesh-poll/pyproject.toml \
18+
poetry -C lambdas/mesh-poll run pytest lambdas/mesh-poll/src/__tests__/ \
19+
--cov=lambdas/mesh-poll/src \
20+
--cov-report=html:lambdas/mesh-poll/htmlcov \
2021
--cov-report=term-missing \
21-
--cov-report=xml:coverage.xml \
22+
--cov-report=xml:lambdas/mesh-poll/coverage.xml \
2223
--cov-branch
2324

2425
lint:

lambdas/mesh-poll/pyproject.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ pytest-cov = "^4.0.0"
2929
jake = "^3.0.1"
3030

3131
[tool.coverage.run]
32-
omit = ["src/__tests__/*"]
32+
relative_files = true
33+
source = ["lambdas/mesh-poll/src"]
34+
omit = ["*/__tests__/*"]
3335

3436
[tool.pytest.ini_options]
3537
pythonpath = "."

scripts/config/sonar-scanner.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ sonar.terraform.provider.aws.version=5.54.1
1010
sonar.cpd.exclusions=**.test.*
1111

1212
# Coverage exclusions
13-
sonar.coverage.exclusions=tests/**, **/*.dev.*, lambdas/**/src/__tests__/**, **/jest.config.ts, **/jest.config.cjs, scripts/**/*.*, docs/**/*.*, utils/utils/src/__tests__/**, src/asyncapigenerator/example_usage.py, src/asyncapigenerator/test_generator.py, src/eventcatalogasyncapiimporter/examples.py
13+
sonar.coverage.exclusions=tests/**, **/*.dev.*, lambdas/**/src/__tests__/**, **/jest.config.ts, **/jest.config.cjs, scripts/**/*.*, docs/**/*.*, utils/utils/src/__tests__/**, src/asyncapigenerator/example_usage.py, src/asyncapigenerator/test_generator.py, src/eventcatalogasyncapiimporter/examples.py, utils/py-mock-mesh/**/*
1414

1515
# Coverage reports
1616
sonar.python.coverage.reportPaths=.coverage/coverage.xml,src/asyncapigenerator/coverage.xml,src/cloudeventjekylldocs/coverage.xml,src/eventcatalogasyncapiimporter/coverage.xml,utils/event-publisher-py/coverage.xml,utils/metric-publishers/coverage.xml,lambdas/mesh-poll/coverage.xml,lambdas/mesh-download/coverage.xml

utils/event-publisher-py/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ test:
1010
poetry run pytest event_publisher/__tests__/ -v
1111

1212
coverage:
13-
poetry run pytest event_publisher/__tests__/ \
14-
--cov=event_publisher \
15-
--cov-report=html:htmlcov \
13+
cd ../.. && COVERAGE_RCFILE=utils/event-publisher-py/pyproject.toml \
14+
poetry -C utils/event-publisher-py run pytest utils/event-publisher-py/event_publisher/__tests__/ \
15+
--cov=utils/event-publisher-py/event_publisher \
16+
--cov-report=html:utils/event-publisher-py/htmlcov \
1617
--cov-report=term-missing \
17-
--cov-report=xml:coverage.xml \
18+
--cov-report=xml:utils/event-publisher-py/coverage.xml \
1819
--cov-branch
1920

2021
clean:

utils/event-publisher-py/pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ moto = "^5.0.0"
2323

2424
[tool.coverage.run]
2525
relative_files = true
26+
source = ["utils/event-publisher-py/event_publisher"]
2627
omit = [
2728
"*/__tests__/*",
2829
"*/test_*.py",

utils/metric-publishers/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@ test:
1414
poetry run pytest || echo
1515

1616
coverage:
17-
poetry run pytest tests/ \
18-
--cov=metric_publishers \
19-
--cov-report=html:htmlcov \
17+
cd ../.. && COVERAGE_RCFILE=utils/metric-publishers/pyproject.toml \
18+
poetry -C utils/metric-publishers run pytest utils/metric-publishers/tests/ \
19+
--cov=utils/metric-publishers/metric_publishers \
20+
--cov-report=html:utils/metric-publishers/htmlcov \
2021
--cov-report=term-missing \
21-
--cov-report=xml:coverage.xml \
22+
--cov-report=xml:utils/metric-publishers/coverage.xml \
2223
--cov-branch
2324

2425
lint:

utils/metric-publishers/pyproject.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ autopep8 = "^2.0.2"
2323
jake = "^3.0.1"
2424

2525
[tool.coverage.run]
26-
omit = ["tests/*"]
26+
relative_files = true
27+
source = ["utils/metric-publishers/metric_publishers"]
28+
omit = ["*/tests/*"]
2729

2830
[build-system]
2931
requires = ["poetry-core>=1.0.0"]

0 commit comments

Comments
 (0)