Skip to content

Extract snapshot lib #10164

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

Merged
dominikschubert merged 13 commits into from
Feb 12, 2024
Merged

Extract snapshot lib #10164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
378d703
add lib as dependency
dominikschubert Feb 1, 2024
014071e
adapt to new externalized snapshot lib
dominikschubert Feb 1, 2024
128d1f3
fix import paths
dominikschubert Feb 1, 2024
5f21b0f
fix module exclusions in github actions
dominikschubert Feb 1, 2024
a822225
fix import path for transformer context
dominikschubert Feb 1, 2024
7e421f5
move snapshot fixture definition one level down to tests/aws
dominikschubert Feb 1, 2024
16886c5
move region fixture definition one level down to tests/aws
dominikschubert Feb 1, 2024
af2450b
fix import paths for transformers
dominikschubert Feb 1, 2024
d1184ae
revert unintentional snapshot change
dominikschubert Feb 1, 2024
0a387ea
use account_id and region fixtures again
dominikschubert Feb 2, 2024
56addfd
unpin jsonpath-ng and localstack-snapshot
dominikschubert Feb 12, 2024
3a9faef
fix path for newer tests
dominikschubert Feb 12, 2024
2a7be19
use localstack-snapshot 0.1.1 with upgraded/unpinned jsonpath_ng depe…
dominikschubert Feb 12, 2024
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/marker-report-issue.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
# makes use of the marker report plugin localstack.testing.pytest.marker_report
- name: Generate marker report
env:
PYTEST_ADDOPTS: "-p no:localstack.testing.pytest.fixtures -p no:localstack.testing.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:tests.fixtures -s --co --disable-warnings --marker-report --marker-report-path './target'"
PYTEST_ADDOPTS: "-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:tests.fixtures -s --co --disable-warnings --marker-report --marker-report-path './target'"
MARKER_REPORT_PROJECT_NAME: localstack
MARKER_REPORT_COMMIT_SHA: ${{ github.sha }}
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/marker-report.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:

- name: Collect marker report
env:
PYTEST_ADDOPTS: "-p no:localstack.testing.pytest.fixtures -p no:localstack.testing.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:tests.fixtures -s --co --disable-warnings --marker-report --marker-report-tinybird-upload"
PYTEST_ADDOPTS: "-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:tests.fixtures -s --co --disable-warnings --marker-report --marker-report-tinybird-upload"
MARKER_REPORT_PROJECT_NAME: localstack
MARKER_REPORT_TINYBIRD_TOKEN: ${{ secrets.MARKER_REPORT_TINYBIRD_TOKEN }}
MARKER_REPORT_COMMIT_SHA: ${{ github.sha }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,6 @@ jobs:
pip install pytest pytest-tinybird
- name: Run CLI tests
env:
PYTEST_ADDOPTS: "${{ env.TINYBIRD_PYTEST_ARGS }}-p no:localstack.testing.pytest.fixtures -p no:localstack.testing.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:localstack.testing.pytest.validation_tracking -p no:tests.fixtures -s"
PYTEST_ADDOPTS: "${{ env.TINYBIRD_PYTEST_ARGS }}-p no:localstack.testing.pytest.fixtures -p no:localstack_snapshot.pytest.snapshot -p no:localstack.testing.pytest.filters -p no:localstack.testing.pytest.fixture_conflicts -p no:localstack.testing.pytest.validation_tracking -p no:tests.fixtures -s"
run: |
python -m pytest tests/cli/
9 changes: 9 additions & 0 deletions localstack/testing/pytest/fixtures.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
AWS_REGION_US_EAST_1,
SECONDARY_TEST_AWS_ACCOUNT_ID,
TEST_AWS_ACCOUNT_ID,
TEST_AWS_REGION_NAME,
)
from localstack.services.stores import (
AccountRegionBundle,
Expand Down Expand Up @@ -1798,6 +1799,14 @@ def cleanups():
LOG.warning("Failed to execute cleanup", exc_info=e)


@pytest.fixture(scope="session")
def region(aws_client):
if is_aws_cloud() or is_api_enabled("sts"):
return aws_client.sts.meta.region_name
else:
return TEST_AWS_REGION_NAME


@pytest.fixture(scope="session")
def account_id(aws_client):
if is_aws_cloud() or is_api_enabled("sts"):
Expand Down
172 changes: 0 additions & 172 deletions localstack/testing/pytest/snapshot.py
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions localstack/testing/snapshots/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
from .prototype import SnapshotAssertionError, SnapshotMatchResult, SnapshotSession

__all__ = [SnapshotSession, SnapshotMatchResult, SnapshotAssertionError]
Loading