Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.15.13
rev: v0.15.14
hooks:
- id: ruff-check
- id: ruff-format
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dev = [
"pytest-mock==3.15.*",
"pytest-randomly==4.1.*",
"pytest-reportportal==5.6.*",
"pytest-rerunfailures==16.2.*",
"pytest-rerunfailures==16.3.*",
"pytest-xdist==3.8.*",
"responses==0.26.*",
"respx==0.23.*",
Expand Down
15 changes: 10 additions & 5 deletions tests/e2e/commerce/order/asset/test_async_asset.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,21 @@
pytestmark = [pytest.mark.flaky]


async def _delete_order_asset(resource_manager, resource):
try:
await resource_manager.delete(resource.id)
except MPTAPIError as error:
print(f"TEARDOWN - Unable to delete order asset: {getattr(error, 'title', str(error))}") # noqa: WPS421


@asynccontextmanager
async def async_create_fixture_resource_and_delete(resource_manager, resource_data):
resource = await resource_manager.create(resource_data)

yield resource

try:
await resource_manager.delete(resource.id)
except MPTAPIError as error:
print(f"TEARDOWN - Unable to delete order asset: {getattr(error, 'title', str(error))}") # noqa: WPS421
yield resource
finally:
await _delete_order_asset(resource_manager, resource)


@pytest.fixture
Expand Down
15 changes: 10 additions & 5 deletions tests/e2e/commerce/order/asset/test_sync_asset.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,21 @@
pytestmark = [pytest.mark.flaky]


def _delete_order_asset(resource_manager, resource):
try:
resource_manager.delete(resource.id)
except MPTAPIError as error:
print(f"TEARDOWN - Unable to delete order asset: {getattr(error, 'title', str(error))}") # noqa: WPS421


@contextmanager
def create_fixture_resource_and_delete(resource_manager, resource_data):
resource = resource_manager.create(resource_data)

yield resource

try:
resource_manager.delete(resource.id)
except MPTAPIError as error:
print(f"TEARDOWN - Unable to delete order asset: {getattr(error, 'title', str(error))}") # noqa: WPS421
yield resource
finally:
_delete_order_asset(resource_manager, resource)


@pytest.fixture
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,23 @@
pytestmark = [pytest.mark.flaky]


async def _delete_subscription(resource_manager, resource):
try:
await resource_manager.delete(resource.id)
except MPTAPIError as error:
print( # noqa: WPS421
f"TEARDOWN - Unable to delete subscription: {getattr(error, 'title', str(error))}"
)


@asynccontextmanager
async def async_create_fixture_resource_and_delete(resource_manager, resource_data):
resource = await resource_manager.create(resource_data)

yield resource

try:
await resource_manager.delete(resource.id)
except MPTAPIError as error:
print(f"TEARDOWN - Unable to delete subscription: {getattr(error, 'title', str(error))}") # noqa: WPS421
yield resource
finally:
await _delete_subscription(resource_manager, resource)


@pytest.fixture
Expand Down
17 changes: 12 additions & 5 deletions tests/e2e/commerce/order/subscription/test_sync_subscription.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,23 @@
pytestmark = [pytest.mark.flaky]


def _delete_subscription(resource_manager, resource):
try:
resource_manager.delete(resource.id)
except MPTAPIError as error:
print( # noqa: WPS421
f"TEARDOWN - Unable to delete subscription: {getattr(error, 'title', str(error))}"
)


@contextmanager
def create_fixture_resource_and_delete(resource_manager, resource_data):
resource = resource_manager.create(resource_data)

yield resource

try:
resource_manager.delete(resource.id)
except MPTAPIError as error:
print(f"TEARDOWN - Unable to delete subscription: {getattr(error, 'title', str(error))}") # noqa: WPS421
yield resource
finally:
_delete_subscription(resource_manager, resource)


@pytest.fixture
Expand Down
30 changes: 20 additions & 10 deletions tests/e2e/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,38 @@
from mpt_api_client.exceptions import MPTAPIError


@asynccontextmanager
async def async_create_fixture_resource_and_delete(service, resource_data):
resource = await service.create(resource_data)
async def _delete_async_resource(service, resource):
try:
await service.delete(resource.id)
except MPTAPIError as error:
print(f"TEARDOWN - Unable to delete resource {resource}: {error.title}") # noqa: WPS421

yield resource

def _delete_resource(service, resource):
try:
await service.delete(resource.id)
service.delete(resource.id)
except MPTAPIError as error:
print(f"TEARDOWN - Unable to delete resource {resource}: {error.title}") # noqa: WPS421


@asynccontextmanager
async def async_create_fixture_resource_and_delete(service, resource_data):
resource = await service.create(resource_data)

try:
yield resource
finally:
await _delete_async_resource(service, resource)


@contextmanager
def create_fixture_resource_and_delete(service, resource_data):
resource = service.create(resource_data)

yield resource

try:
service.delete(resource.id)
except MPTAPIError as error:
print(f"TEARDOWN - Unable to delete resource {resource}: {error.title}") # noqa: WPS421
yield resource
finally:
_delete_resource(service, resource)


async def assert_async_service_filter_with_iterate(service, filter_by_id, select: list[str] | None):
Expand Down
56 changes: 28 additions & 28 deletions uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.