diff --git a/cg/apps/housekeeper/hk.py b/cg/apps/housekeeper/hk.py index 2a2dd179aa..9de21d1963 100644 --- a/cg/apps/housekeeper/hk.py +++ b/cg/apps/housekeeper/hk.py @@ -7,11 +7,7 @@ from housekeeper.include import checksum as hk_checksum from housekeeper.include import include_version -from housekeeper.store.database import ( - create_all_tables, - drop_all_tables, - initialize_database, -) +from housekeeper.store.database import create_all_tables, drop_all_tables, initialize_database from housekeeper.store.models import Archive, Bundle, File, Tag, Version from housekeeper.store.store import Store from sqlalchemy.orm import Query @@ -27,17 +23,13 @@ class HousekeeperAPI: - """API to decouple cg code from Housekeeper""" + """API to decouple cg code from Housekeeper.""" def __init__(self, config: dict) -> None: initialize_database(config["housekeeper"]["database"]) self._store = Store(config["housekeeper"]["root"]) self.root_dir: str = config["housekeeper"]["root"] - def __getattr__(self, name): - LOG.warning(f"Called undefined {name} on {self.__class__.__name__}, please wrap") - return getattr(self._store, name) - def new_bundle(self, name: str, created_at: datetime = None) -> Bundle: """Create a new file bundle.""" return self._store.new_bundle(name, created_at) diff --git a/tests/apps/hk/test__getattr__.py b/tests/apps/hk/test__getattr__.py deleted file mode 100644 index 5a0a81ee79..0000000000 --- a/tests/apps/hk/test__getattr__.py +++ /dev/null @@ -1,20 +0,0 @@ -""" Test the __getattr__ override when calling private _store.""" - -import logging - -from tests.mocks.hk_mock import MockHousekeeperAPI - - -def test_calling_method_on_private_store_give_warning(housekeeper_api: MockHousekeeperAPI, caplog): - """Test that we get a log warning for unwrapped methods.""" - - # GIVEN an hk api and a method that is not wrapped - caplog.set_level(logging.WARNING) - - # WHEN we call add_file - housekeeper_api.get_files_before() - - # THEN the log should contain a warning that we have called something non-wrapped - with caplog.at_level(logging.WARNING): - assert "files_before" in caplog.text - assert "HousekeeperAPI" in caplog.text