Rebase test fixes

api/controller.py

@@ -82,7 +82,7 @@
     InvalidTokenTypeError,
 )
 from core.model.discovery_service_registration import DiscoveryServiceRegistration
-from core.opds import NavigationFacets, NavigationFeed
+from core.opds import NavigationFacets
 from core.opds2 import AcquisitonFeedOPDS2
 from core.opensearch import OpenSearchDocument
 from core.query.playtime_entries import PlaytimeEntries

tests/api/feed_protocol/test_library_annotator.py

@@ -29,7 +29,6 @@
 from core.lcp.credential import LCPCredentialFactory, LCPHashedPassphrase
 from core.model import (
     CirculationEvent,
-    ConfigurationSetting,
     Contributor,
     DataSource,
     DeliveryMechanism,
@@ -341,13 +340,7 @@ def test_adobe_id_tags_when_vendor_id_configured(
 
         # Delete one setting from the existing integration to check
         # this.
-        setting = ConfigurationSetting.for_library_and_externalintegration(
-            annotator_fixture.db.session,
-            ExternalIntegration.USERNAME,
-            library,
-            vendor_id_fixture.registry,
-        )
-        annotator_fixture.db.session.delete(setting)
+        vendor_id_fixture.registration.short_name = None
         assert {} == annotator_fixture.annotator.adobe_id_tags("new identifier")
 
     def test_lcp_acquisition_link_contains_hashed_passphrase(
@@ -958,12 +951,7 @@ def test_active_loan_feed(
             == licensor.attrib["{http://librarysimplified.org/terms/drm}vendor"]
         )
         [client_token] = licensor
-        expected = ConfigurationSetting.for_library_and_externalintegration(
-            annotator_fixture.db.session,
-            ExternalIntegration.USERNAME,
-            annotator_fixture.db.default_library(),
-            vendor_id_fixture.registry,
-        ).value.upper()
+        expected = vendor_id_fixture.registration.short_name.upper()
         assert client_token.text.startswith(expected)
         assert adobe_patron_identifier in client_token.text