Skip to content

Commit

Permalink
Rebase fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
RishiDiwanTT committed Sep 1, 2023
1 parent 90defb3 commit f77e2dd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 0 additions & 1 deletion core/feed_protocol/annotator/circulation.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import copy
import datetime
import logging
import os
import urllib.error
import urllib.parse
import urllib.request
Expand Down
5 changes: 4 additions & 1 deletion tests/api/feed_protocol/test_opds_acquisition_feed.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
from core.util.datetime_helpers import utc_now
from core.util.flask_util import OPDSEntryResponse, OPDSFeedResponse
from core.util.opds_writer import OPDSFeed, OPDSMessage
from tests.api.feed_protocol.fixtures import PatchedUrlFor, patch_url_for # noqa
from tests.fixtures.database import DatabaseTransactionFixture
from tests.fixtures.search import ExternalSearchPatchFixture

Expand Down Expand Up @@ -925,7 +926,9 @@ def facet_link(cls, url, facet_title, group_title, selected):
assert Facets.GROUP_DISPLAY_TITLES[Facets.COLLECTION_FACET_GROUP_NAME] == group
assert True == selected

def test_active_loans_for_with_holds(self, db: DatabaseTransactionFixture):
def test_active_loans_for_with_holds(
self, db: DatabaseTransactionFixture, patch_url_for: PatchedUrlFor
):
patron = db.patron()
work = db.work(with_license_pool=True)
hold, _ = work.active_license_pool().on_hold_to(patron)
Expand Down

0 comments on commit f77e2dd

Please sign in to comment.