fix more tests

7 files changed, 17 insertions, 25 deletions

diff --git a/test_utils/managers/thl/conftest.py b/test_utils/managers/thl/conftest.py
index 98dd574..355a39d 100644
--- a/test_utils/managers/thl/conftest.py
+++ b/test_utils/managers/thl/conftest.py
@@ -240,7 +240,7 @@ def mysql_user_manager(thl_web_rw: PostgresConfig) -> MysqlUserManager:
 
 @pytest.fixture(scope="session")
 def redis_user_manager(thl_redis_config: RedisConfig) -> RedisUserManager:
-    return RedisUserManager(redis_dsn=thl_redis_config)
+    return RedisUserManager(redis_dsn=thl_redis_config.dsn)
 
 
 @pytest.fixture(scope="session")
diff --git a/test_utils/models/thl/conftest.py b/test_utils/models/thl/conftest.py
index fe2b4f5..376891c 100644
--- a/test_utils/models/thl/conftest.py
+++ b/test_utils/models/thl/conftest.py
@@ -496,6 +496,7 @@ def unsaved_ip_geoname(ip_geoname_factory: Callable[..., IPGeoname]) -> IPGeonam
 
 # --- IP Information ---
 
+
 @pytest.fixture
 def ip_information_factory(
     ip_information_manager: IPInformationManager,
@@ -833,13 +834,8 @@ def audit_log_factory(audit_log_manager: AuditLogManager) -> Callable[..., Audit
 
 
 @pytest.fixture()
-def audit_log(auditlog_factory: Callable[..., AuditLog]) -> AuditLog:
-    return auditlog_factory(save=True)
-
-
-@pytest.fixture()
-def unsaved_audit_log(auditlog_factory: Callable[..., AuditLog]) -> AuditLog:
-    return auditlog_factory(save=False)
+def audit_log(audit_log_factory: Callable[..., AuditLog], user: User) -> AuditLog:
+    return audit_log_factory(user_id=user.user_id)
 
 
 # --- ---
diff --git a/tests/managers/thl/test_task_status.py b/tests/managers/thl/test_task_status.py
index 4a401fa..11edc99 100644
--- a/tests/managers/thl/test_task_status.py
+++ b/tests/managers/thl/test_task_status.py
@@ -39,7 +39,7 @@ start3 = datetime(2023, 2, 3, tzinfo=UTC)
 finish3 = start3 + timedelta(minutes=5)
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture()
 def bp1(
     product_factory: Callable[..., Product], product_manager: ProductManager
 ) -> Product:
@@ -50,7 +50,7 @@ def bp1(
     )
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture()
 def bp2(
     product_factory: Callable[..., Product], product_manager: ProductManager
 ) -> Product:
@@ -66,7 +66,7 @@ def bp2(
     )
 
 
-@pytest.fixture(scope="session")
+@pytest.fixture()
 def bp3(
     product_factory: Callable[..., Product], product_manager: ProductManager
 ) -> Product:
diff --git a/tests/managers/thl/test_user_manager/test_base.py b/tests/managers/thl/test_user_manager/test_base.py
index c69f297..5d12052 100644
--- a/tests/managers/thl/test_user_manager/test_base.py
+++ b/tests/managers/thl/test_user_manager/test_base.py
@@ -305,7 +305,7 @@ class TestUserManagerMethods:
         assert len(res) == 0
 
         msg = uuid4().hex
-        user_manager.audit_log(user=user, level=30, event_type=msg)
+        user_manager.audit_log(audit_log_manager, user=user, level=30, event_type=msg)
 
         res = audit_log_manager.filter_by_user_id(user_id=user.user_id)
         assert len(res) == 1
diff --git a/tests/managers/thl/test_user_manager/test_redis.py b/tests/managers/thl/test_user_manager/test_redis.py
index e51aae9..f6b59c9 100644
--- a/tests/managers/thl/test_user_manager/test_redis.py
+++ b/tests/managers/thl/test_user_manager/test_redis.py
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
 class TestUserManagerRedis:
 
     def test_get_notset(self, redis_user_manager: RedisUserManager, user: User):
-        redis_user_manager.clear_user_inmemory_cache(user=user)
+        redis_user_manager.clear_user(user=user)
         assert redis_user_manager.get_user(user_id=user.user_id) is None
 
     def test_get_user_id(self, redis_user_manager: RedisUserManager, user: User):
diff --git a/tests/managers/thl/test_user_streak.py b/tests/managers/thl/test_user_streak.py
index 59dee2d..d99b2b8 100644
--- a/tests/managers/thl/test_user_streak.py
+++ b/tests/managers/thl/test_user_streak.py
@@ -112,10 +112,8 @@ def create_session_fail(
     session_manager: SessionManager,
     start: datetime,
     user: User,
-    session_factory: Callable[..., Session],
-    wall_factory: Callable[..., Wall],
 ):
-    session = session_factory(started=start, country_iso="us", user=user)
+    session = session_manager.create(started=start, country_iso="us", user=user)
     session_manager.finish_with_status(
         session,
         finished=start + timedelta(minutes=1),
@@ -128,10 +126,8 @@ def create_session_complete(
     session_manager: SessionManager,
     start: datetime,
     user: User,
-    session_factory: Callable[..., Session],
-    wall_factory: Callable[..., Wall],
 ):
-    session = session_factory(started=start, country_iso="us", user=user)
+    session = session_manager.create(started=start, country_iso="us", user=user)
     session_manager.finish_with_status(
         session,
         finished=start + timedelta(minutes=1),
@@ -153,7 +149,7 @@ def test_user_streaks_active_broken(
     user: User,
     session_manager: SessionManager,
     broken_active_streak: list[UserStreak],
-    session_factory: Callable[..., Session],
+    bare_session_factory: Callable[..., Session],
     wall_factory: Callable[..., Wall],
 ):
     # Testing active streak, but broken (not today or yesterday)
@@ -161,7 +157,7 @@ def test_user_streaks_active_broken(
     end1 = start1 + timedelta(minutes=1)
 
     # abandon counts as inactive
-    session = session_factory(started=start1, country_iso="us", user=user)
+    session = bare_session_factory(started=start1, country_iso="us", user=user)
     streak = user_streak_manager.get_user_streaks(user_id=user.user_id)
     assert streak == []
 
diff --git a/tests/managers/thl/test_userhealth.py b/tests/managers/thl/test_userhealth.py
index a86361a..268b110 100644
--- a/tests/managers/thl/test_userhealth.py
+++ b/tests/managers/thl/test_userhealth.py
@@ -319,7 +319,7 @@ class TestUserIpHistoryManager:
         ip_geoname: IPGeoname,
     ):
         ip = fake.ipv4_public()
-        ip_information_factory(ip=ip, geoname=ip_geoname, is_anonymous=True)
+        ip_information_factory(ip=ip, geoname_id=ip_geoname.geoname_id, is_anonymous=True)
         ipr1: IPRecord = ip_record_factory(user_id=user.user_id, ip=ip)
 
         ipr = user_iphistory_manager.get_user_latest_ip_record(user=user)
@@ -330,7 +330,7 @@ class TestUserIpHistoryManager:
         assert ipr.information.lookup_prefix == "/32"
 
         ip = fake.ipv6()
-        ip_information_factory(ip=ip, geoname=ip_geoname)
+        ip_information_factory(ip=ip, geoname_id=ip_geoname.geoname_id)
         ipr2: IPRecord = ip_record_factory(user_id=user.user_id, ip=ip)
 
         ipr = user_iphistory_manager.get_user_latest_ip_record(user=user)
@@ -386,7 +386,7 @@ class TestUserIpHistoryManager:
         assert ipr.information is None
         assert not ipr.is_anonymous
 
-        ip_information_factory(ip=ip, geoname=ip_geoname, is_anonymous=True)
+        ip_information_factory(ip=ip, geoname_id=ip_geoname.geoname_id, is_anonymous=True)
         iph = user_iphistory_manager.get_user_ip_history(user_id=user.user_id)
         assert isinstance(iph, UserIPHistory)
         assert isinstance(iph.ips, list)
@@ -414,7 +414,7 @@ class TestUserIpHistoryManager:
         assert ipr.information is None
         assert not ipr.is_anonymous
 
-        ip_information_factory(ip=ip, geoname=ip_geoname, is_anonymous=True)
+        ip_information_factory(ip=ip, geoname_id=ip_geoname.geoname_id, is_anonymous=True)
         iph = user_iphistory_manager.get_user_ip_history(user_id=user.user_id)
         assert isinstance(iph, UserIPHistory)
         assert isinstance(iph.ips, list)