Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev: Pytest-split test #1144

Merged
merged 16 commits into from
Feb 18, 2025
Merged

dev: Pytest-split test #1144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
c5c1f06
stuff required for pytest-split
ajay-sentry Feb 7, 2025
3ef611a
try out the new workflow
ajay-sentry Feb 12, 2025
66fba13
update makefile adding split
ajay-sentry Feb 12, 2025
0dcc2e4
use group if exists or fallback
ajay-sentry Feb 13, 2025
8e42155
also update splits to be dynamic
ajay-sentry Feb 13, 2025
6bb226f
Merge branch 'main' into Ajay/pytest-split
ajay-sentry Feb 13, 2025
2c6d55f
test it
ajay-sentry Feb 13, 2025
326353d
plumb
ajay-sentry Feb 13, 2025
a5ff4fe
fix thsi
ajay-sentry Feb 13, 2025
9afdf21
comment out this test to run everything
ajay-sentry Feb 13, 2025
7dc524b
comment out integration tests
ajay-sentry Feb 13, 2025
1e5e9e7
Merge branch 'main' into Ajay/pytest-split
ajay-sentry Feb 14, 2025
648d7d0
update xmls
ajay-sentry Feb 14, 2025
c67b728
skip test and add comment instead of comment out, update test duratio…
ajay-sentry Feb 14, 2025
3343bbe
use matts version
ajay-sentry Feb 14, 2025
6e028a8
use latest split release
ajay-sentry Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
test:
name: Test
needs: [build]
uses: codecov/gha-workflows/.github/workflows/[email protected].27
uses: codecov/gha-workflows/.github/workflows/run-tests-split[email protected].29
secrets: inherit
with:
repo: ${{ vars.CODECOV_IMAGE_V2 || 'codecov/self-hosted-api' }}
Expand Down
2,755 changes: 2,755 additions & 0 deletions .test_durations
View file
Open in desktop

Large diffs are not rendered by default.

24 changes: 20 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,18 @@ test:
COVERAGE_CORE=sysmon python -m pytest --cov=./ --junitxml=junit.xml -o junit_family=legacy

test.unit:
COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "not integration" --cov-report=xml:unit.coverage.xml --junitxml=unit.junit.xml -o junit_family=legacy
@if [ -n "$(GROUP)" ]; then \
COVERAGE_CORE=sysmon python -m pytest --splits ${SPLIT} --group $(GROUP) --cov=./ -m "not integration" --cov-report=xml:unit.$(GROUP).coverage.xml --junitxml=unit.$(GROUP).junit.xml -o junit_family=legacy; \
else \
COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "not integration" --cov-report=xml:unit.coverage.xml --junitxml=unit.junit.xml -o junit_family=legacy; \
fi

test.integration:
COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "integration" --cov-report=xml:integration.coverage.xml --junitxml=integration.junit.xml -o junit_family=legacy
@if [ -n "$(GROUP)" ]; then \
COVERAGE_CORE=sysmon python -m pytest --splits ${SPLIT} --group $(GROUP) --cov=./ -m "integration" --cov-report=xml:integration.$(GROUP).coverage.xml --junitxml=integration.$(GROUP).junit.xml -o junit_family=legacy; \
else \
COVERAGE_CORE=sysmon python -m pytest --cov=./ -m "integration" --cov-report=xml:integration.coverage.xml --junitxml=integration.junit.xml -o junit_family=legacy; \
fi

lint:
make lint.install
Expand Down Expand Up @@ -205,10 +213,18 @@ test_env.container_check_db:
while ! nc -vz timescale 5432; do sleep 1; echo "waiting for timescale"; done

test_env.run_unit:
docker-compose exec api make test.unit
@if [ -n "$(GROUP)" ]; then \
docker-compose exec api make test.unit SPLIT=${SPLIT} GROUP=${GROUP}; \
else \
docker-compose exec api make test.unit; \
fi

test_env.run_integration:
#docker-compose exec api make test.integration
# @if [ -n "$(GROUP)" ]; then \
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment this out if we ever have integration tests and it should just work

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you know why is this command commented to begin with?

# docker-compose exec api make test.integration SPLIT=${SPLIT} GROUP=${GROUP}; \
# else \
# docker-compose exec api make test.integration; \
# fi
echo "Skipping. No Tests"

test_env.check-for-migration-conflicts:
Expand Down
18 changes: 10 additions & 8 deletions graphql_api/tests/test_pull.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from datetime import datetime, timedelta
from unittest.mock import patch

import pytest
from django.test import TransactionTestCase
from freezegun import freeze_time
from shared.api_archive.archive import ArchiveService
Expand Down Expand Up @@ -459,27 +460,28 @@ def test_with_complete_pull_request(self):
"behindByCommit": "1089nf898as-jdf09hahs09fgh",
}

@pytest.mark.skip(
reason="Skipping due to https://github.com/codecov/engineering-team/issues/3358"
)
def test_compare_bundle_analysis_missing_reports(self):
repository = RepositoryFactory(author=self.owner)
head = CommitFactory(
repository=self.repository,
repository=repository,
author=self.owner,
commitid="5672734ij1n234918231290j12nasdfioasud0f9",
commitid="cool-commit-id",
totals={"c": "78.38", "diff": [0, 0, 0, 0, 0, "14"]},
)
compared_to = CommitFactory(
repository=self.repository,
repository=repository,
author=self.owner,
commitid="9asd78fa7as8d8fa97s8d7fgagsd8fa9asd8f77s",
commitid="blah",
)

my_pull = PullFactory(
repository=self.repository,
title="test-pull-request",
repository=repository,
author=self.owner,
head=head.commitid,
compared_to=compared_to.commitid,
behind_by=23,
behind_by_commit="1089nf898as-jdf09hahs09fgh",
)

pull = self.fetch_one_pull_request(
Expand Down
1 change: 1 addition & 0 deletions requirements.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ pytest-cov
pytest-django
pytest-mock
pytest>=7.2.0
pytest-split
python-dateutil
python-json-logger
python-redis-lock
Expand Down
3 changes: 3 additions & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,7 @@ pytest==8.1.1
# pytest-cov
# pytest-django
# pytest-mock
# pytest-split
pytest-asyncio==0.23.6
# via -r requirements.in
pytest-cov==5.0.0
Expand All @@ -366,6 +367,8 @@ pytest-django==4.8.0
# via -r requirements.in
pytest-mock==3.14.0
# via -r requirements.in
pytest-split==0.10.0
# via -r requirements.in
python-dateutil==2.9.0.post0
# via
# -r requirements.in
Expand Down