From c15ca266fea1986626d5967fca33c1e743d48027 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 16 Aug 2024 10:04:29 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- ecommerce/api.py | 8 ++++++-- ecommerce/api_test.py | 15 +++++++++------ ecommerce/conftest.py | 1 - 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/ecommerce/api.py b/ecommerce/api.py index cd2561047d..6a40e8fd71 100644 --- a/ecommerce/api.py +++ b/ecommerce/api.py @@ -752,11 +752,15 @@ def clear_and_delete_baskets(user=None): course_run_selections_ids = list( course_run_selections.values_list("id", flat=True) ) - log.info("Deleting course run selections: %s", course_run_selections_ids) + log.info( + "Deleting course run selections: %s", course_run_selections_ids + ) course_run_selections.delete() coupon_selections = basket.couponselection_set.all() - coupon_selections_ids = list(coupon_selections.values_list("id", flat=True)) + coupon_selections_ids = list( + coupon_selections.values_list("id", flat=True) + ) log.info("Deleting coupon selections: %s", coupon_selections_ids) coupon_selections.delete() diff --git a/ecommerce/api_test.py b/ecommerce/api_test.py index 89d95011b7..f9534a36be 100644 --- a/ecommerce/api_test.py +++ b/ecommerce/api_test.py @@ -1102,7 +1102,9 @@ def test_delete_baskets_with_user_args(baskets_with_different_users): clear_and_delete_baskets(user1) assert Basket.objects.filter(user=user1).count() == 0 - assert Basket.objects.filter(user=user2).count() == 1 # Not deleting basket of other users + assert ( + Basket.objects.filter(user=user2).count() == 1 + ) # Not deleting basket of other users @pytest.mark.parametrize("is_expired", [True, False]) @@ -1114,10 +1116,10 @@ def test_delete_expired_basket(mocker, user, basket_and_coupons, is_expired): basket_and_coupons.basket.save() if is_expired: - now_in_utc = mocker.patch("ecommerce.api.now_in_utc") - now_in_utc.return_value = datetime.datetime.now( - tz=datetime.timezone.utc - ) + datetime.timedelta(days=settings.BASKET_EXPIRY_DAYS) + now_in_utc = mocker.patch("ecommerce.api.now_in_utc") + now_in_utc.return_value = datetime.datetime.now( + tz=datetime.timezone.utc + ) + datetime.timedelta(days=settings.BASKET_EXPIRY_DAYS) else: mocker.patch("django.conf.settings.BASKET_EXPIRY_DAYS", 15) @@ -1143,7 +1145,8 @@ def test_complete_order(mocker, user, basket_and_coupons): patched_enroll.assert_called_once_with(order) patched_clear_and_delete_baskets.assert_called_once_with(mocker.ANY) assert ( - patched_clear_and_delete_baskets.call_args[0][0] == basket_and_coupons.basket.user + patched_clear_and_delete_baskets.call_args[0][0] + == basket_and_coupons.basket.user ) diff --git a/ecommerce/conftest.py b/ecommerce/conftest.py index df1455aa72..eebc33dca0 100644 --- a/ecommerce/conftest.py +++ b/ecommerce/conftest.py @@ -41,7 +41,6 @@ def baskets_with_different_users(): user2 = UserFactory.create() basket2 = BasketFactory.create(user=user2) - return SimpleNamespace(baskets=[basket1, basket2])