From f3bb710aa1812dc24cc94a86211f1d1eab3da7fc Mon Sep 17 00:00:00 2001
From: Leonidas Spyropoulos <artafinde@archlinux.org>
Date: Fri, 6 May 2022 20:22:07 +0100
Subject: [PATCH] chore: rename logging.py and redis.py to avoid circular
 imports

Signed-off-by: Leonidas Spyropoulos <artafinde@archlinux.org>
---
 aurweb/asgi.py                        |  7 +++----
 aurweb/{logging.py => aur_logging.py} |  0
 aurweb/{redis.py => aur_redis.py}     |  4 ++--
 aurweb/initdb.py                      |  2 +-
 aurweb/models/user.py                 |  4 ++--
 aurweb/packages/util.py               |  2 +-
 aurweb/pkgbase/actions.py             |  4 ++--
 aurweb/prometheus.py                  |  4 ++--
 aurweb/ratelimit.py                   |  6 +++---
 aurweb/routers/accounts.py            |  4 ++--
 aurweb/routers/html.py                |  6 +++---
 aurweb/routers/packages.py            |  4 ++--
 aurweb/routers/pkgbase.py             |  4 ++--
 aurweb/routers/trusted_user.py        |  4 ++--
 aurweb/scripts/mkpkglists.py          |  4 ++--
 aurweb/scripts/notify.py              |  4 ++--
 aurweb/scripts/rendercomment.py       |  4 ++--
 aurweb/testing/alpm.py                |  4 ++--
 aurweb/testing/filelock.py            |  4 ++--
 aurweb/users/validate.py              |  4 ++--
 aurweb/util.py                        |  4 ++--
 test/conftest.py                      |  4 ++--
 test/test_accounts_routes.py          |  4 ++--
 test/test_asgi.py                     |  6 +++---
 test/test_homepage.py                 |  2 +-
 test/test_logging.py                  |  4 ++--
 test/test_packages_util.py            |  2 +-
 test/test_ratelimit.py                |  6 +++---
 test/test_redis.py                    | 24 ++++++++++++------------
 test/test_rendercomment.py            |  4 ++--
 test/test_rpc.py                      |  2 +-
 test/test_rss.py                      |  4 ++--
 32 files changed, 72 insertions(+), 73 deletions(-)
 rename aurweb/{logging.py => aur_logging.py} (100%)
 rename aurweb/{redis.py => aur_redis.py} (95%)

diff --git a/aurweb/asgi.py b/aurweb/asgi.py
index fa2526ed..2fe20b08 100644
--- a/aurweb/asgi.py
+++ b/aurweb/asgi.py
@@ -24,20 +24,19 @@ from starlette.middleware.sessions import SessionMiddleware
 import aurweb.captcha  # noqa: F401
 import aurweb.config
 import aurweb.filters  # noqa: F401
-import aurweb.logging
 import aurweb.pkgbase.util as pkgbaseutil
 
-from aurweb import logging, prometheus, util
+from aurweb import aur_logging, prometheus, util
+from aurweb.aur_redis import redis_connection
 from aurweb.auth import BasicAuthBackend
 from aurweb.db import get_engine, query
 from aurweb.models import AcceptedTerm, Term
 from aurweb.packages.util import get_pkg_or_base
 from aurweb.prometheus import instrumentator
-from aurweb.redis import redis_connection
 from aurweb.routers import APP_ROUTES
 from aurweb.templates import make_context, render_template
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 # Setup the FastAPI app.
 app = FastAPI()
diff --git a/aurweb/logging.py b/aurweb/aur_logging.py
similarity index 100%
rename from aurweb/logging.py
rename to aurweb/aur_logging.py
diff --git a/aurweb/redis.py b/aurweb/aur_redis.py
similarity index 95%
rename from aurweb/redis.py
rename to aurweb/aur_redis.py
index e29b8e37..52b3ee41 100644
--- a/aurweb/redis.py
+++ b/aurweb/aur_redis.py
@@ -4,9 +4,9 @@ from redis import ConnectionPool, Redis
 
 import aurweb.config
 
-from aurweb import logging
+from aurweb import aur_logging
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 pool = None
 
 
diff --git a/aurweb/initdb.py b/aurweb/initdb.py
index a4a9f621..6a73a5dc 100644
--- a/aurweb/initdb.py
+++ b/aurweb/initdb.py
@@ -3,8 +3,8 @@ import argparse
 import alembic.command
 import alembic.config
 
+import aurweb.aur_logging
 import aurweb.db
-import aurweb.logging
 import aurweb.schema
 
 
diff --git a/aurweb/models/user.py b/aurweb/models/user.py
index 3fa72a85..ce52aa82 100644
--- a/aurweb/models/user.py
+++ b/aurweb/models/user.py
@@ -13,12 +13,12 @@ import aurweb.config
 import aurweb.models.account_type
 import aurweb.schema
 
-from aurweb import db, logging, schema, time, util
+from aurweb import aur_logging, db, schema, time, util
 from aurweb.models.account_type import AccountType as _AccountType
 from aurweb.models.ban import is_banned
 from aurweb.models.declarative import Base
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 SALT_ROUNDS_DEFAULT = 12
 
diff --git a/aurweb/packages/util.py b/aurweb/packages/util.py
index bd173065..0583ffb5 100644
--- a/aurweb/packages/util.py
+++ b/aurweb/packages/util.py
@@ -8,11 +8,11 @@ from fastapi import HTTPException
 from sqlalchemy import orm
 
 from aurweb import config, db, models
+from aurweb.aur_redis import redis_connection
 from aurweb.models import Package
 from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
 from aurweb.models.package_dependency import PackageDependency
 from aurweb.models.package_relation import PackageRelation
-from aurweb.redis import redis_connection
 from aurweb.templates import register_filter
 
 Providers = list[Union[PackageRelation, OfficialProvider]]
diff --git a/aurweb/pkgbase/actions.py b/aurweb/pkgbase/actions.py
index 46609f89..6ba628b7 100644
--- a/aurweb/pkgbase/actions.py
+++ b/aurweb/pkgbase/actions.py
@@ -1,6 +1,6 @@
 from fastapi import Request
 
-from aurweb import db, logging, util
+from aurweb import aur_logging, db, util
 from aurweb.auth import creds
 from aurweb.models import PackageBase
 from aurweb.models.package_comaintainer import PackageComaintainer
@@ -10,7 +10,7 @@ from aurweb.packages.requests import handle_request, update_closure_comment
 from aurweb.pkgbase import util as pkgbaseutil
 from aurweb.scripts import notify, popupdate
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 def pkgbase_notify_instance(request: Request, pkgbase: PackageBase) -> None:
diff --git a/aurweb/prometheus.py b/aurweb/prometheus.py
index 227d46ed..4adaae4b 100644
--- a/aurweb/prometheus.py
+++ b/aurweb/prometheus.py
@@ -5,9 +5,9 @@ from prometheus_fastapi_instrumentator import Instrumentator
 from prometheus_fastapi_instrumentator.metrics import Info
 from starlette.routing import Match, Route
 
-from aurweb import logging
+from aurweb import aur_logging
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 _instrumentator = Instrumentator()
 
 
diff --git a/aurweb/ratelimit.py b/aurweb/ratelimit.py
index 659ab6b8..fb240831 100644
--- a/aurweb/ratelimit.py
+++ b/aurweb/ratelimit.py
@@ -1,11 +1,11 @@
 from fastapi import Request
 from redis.client import Pipeline
 
-from aurweb import config, db, logging, time
+from aurweb import aur_logging, config, db, time
+from aurweb.aur_redis import redis_connection
 from aurweb.models import ApiRateLimit
-from aurweb.redis import redis_connection
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 def _update_ratelimit_redis(request: Request, pipeline: Pipeline):
diff --git a/aurweb/routers/accounts.py b/aurweb/routers/accounts.py
index dcac72b0..7a381f9d 100644
--- a/aurweb/routers/accounts.py
+++ b/aurweb/routers/accounts.py
@@ -10,7 +10,7 @@ from sqlalchemy import and_, or_
 
 import aurweb.config
 
-from aurweb import cookies, db, l10n, logging, models, util
+from aurweb import aur_logging, cookies, db, l10n, models, util
 from aurweb.auth import account_type_required, requires_auth, requires_guest
 from aurweb.captcha import get_captcha_salts
 from aurweb.exceptions import ValidationError, handle_form_exceptions
@@ -24,7 +24,7 @@ from aurweb.users import update, validate
 from aurweb.users.util import get_user_by_name
 
 router = APIRouter()
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 @router.get("/passreset", response_class=HTMLResponse)
diff --git a/aurweb/routers/html.py b/aurweb/routers/html.py
index d31a32c7..82aa2f06 100644
--- a/aurweb/routers/html.py
+++ b/aurweb/routers/html.py
@@ -13,7 +13,7 @@ from sqlalchemy import and_, case, or_
 import aurweb.config
 import aurweb.models.package_request
 
-from aurweb import cookies, db, logging, models, time, util
+from aurweb import aur_logging, cookies, db, models, time, util
 from aurweb.cache import db_count_cache
 from aurweb.exceptions import handle_form_exceptions
 from aurweb.models.account_type import TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID
@@ -21,7 +21,7 @@ from aurweb.models.package_request import PENDING_ID
 from aurweb.packages.util import query_notified, query_voted, updated_packages
 from aurweb.templates import make_context, render_template
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 router = APIRouter()
 
 
@@ -73,7 +73,7 @@ async def index(request: Request):
 
     bases = db.query(models.PackageBase)
 
-    redis = aurweb.redis.redis_connection()
+    redis = aurweb.aur_redis.redis_connection()
     cache_expire = 300  # Five minutes.
 
     # Package statistics.
diff --git a/aurweb/routers/packages.py b/aurweb/routers/packages.py
index 7bf4e3d4..8fbd539c 100644
--- a/aurweb/routers/packages.py
+++ b/aurweb/routers/packages.py
@@ -6,7 +6,7 @@ from fastapi import APIRouter, Form, Query, Request, Response
 
 import aurweb.filters  # noqa: F401
 
-from aurweb import config, db, defaults, logging, models, util
+from aurweb import aur_logging, config, db, defaults, models, util
 from aurweb.auth import creds, requires_auth
 from aurweb.exceptions import InvariantError, handle_form_exceptions
 from aurweb.models.relation_type import CONFLICTS_ID, PROVIDES_ID, REPLACES_ID
@@ -17,7 +17,7 @@ from aurweb.pkgbase import actions as pkgbase_actions
 from aurweb.pkgbase import util as pkgbaseutil
 from aurweb.templates import make_context, make_variable_context, render_template
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 router = APIRouter()
 
 
diff --git a/aurweb/routers/pkgbase.py b/aurweb/routers/pkgbase.py
index 6cd4199d..0ad977d3 100644
--- a/aurweb/routers/pkgbase.py
+++ b/aurweb/routers/pkgbase.py
@@ -4,7 +4,7 @@ from fastapi import APIRouter, Form, HTTPException, Query, Request, Response
 from fastapi.responses import JSONResponse, RedirectResponse
 from sqlalchemy import and_
 
-from aurweb import config, db, l10n, logging, templates, time, util
+from aurweb import aur_logging, config, db, l10n, templates, time, util
 from aurweb.auth import creds, requires_auth
 from aurweb.exceptions import InvariantError, ValidationError, handle_form_exceptions
 from aurweb.models import PackageBase
@@ -23,7 +23,7 @@ from aurweb.scripts import notify, popupdate
 from aurweb.scripts.rendercomment import update_comment_render_fastapi
 from aurweb.templates import make_variable_context, render_template
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 router = APIRouter()
 
 
diff --git a/aurweb/routers/trusted_user.py b/aurweb/routers/trusted_user.py
index e1267409..124a5d7a 100644
--- a/aurweb/routers/trusted_user.py
+++ b/aurweb/routers/trusted_user.py
@@ -8,7 +8,7 @@ from fastapi import APIRouter, Form, HTTPException, Request
 from fastapi.responses import RedirectResponse, Response
 from sqlalchemy import and_, func, or_
 
-from aurweb import db, l10n, logging, models, time
+from aurweb import aur_logging, db, l10n, models, time
 from aurweb.auth import creds, requires_auth
 from aurweb.exceptions import handle_form_exceptions
 from aurweb.models import User
@@ -16,7 +16,7 @@ from aurweb.models.account_type import TRUSTED_USER_AND_DEV_ID, TRUSTED_USER_ID
 from aurweb.templates import make_context, make_variable_context, render_template
 
 router = APIRouter()
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 # Some TU route specific constants.
 ITEMS_PER_PAGE = 10  # Paged table size.
diff --git a/aurweb/scripts/mkpkglists.py b/aurweb/scripts/mkpkglists.py
index 888e346c..f3e2f8f4 100755
--- a/aurweb/scripts/mkpkglists.py
+++ b/aurweb/scripts/mkpkglists.py
@@ -35,11 +35,11 @@ from sqlalchemy import literal, orm
 
 import aurweb.config
 
-from aurweb import db, filters, logging, models, util
+from aurweb import aur_logging, db, filters, models, util
 from aurweb.benchmark import Benchmark
 from aurweb.models import Package, PackageBase, User
 
-logger = logging.get_logger("aurweb.scripts.mkpkglists")
+logger = aur_logging.get_logger("aurweb.scripts.mkpkglists")
 
 
 TYPE_MAP = {
diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py
index 6afa65ae..f8399f50 100755
--- a/aurweb/scripts/notify.py
+++ b/aurweb/scripts/notify.py
@@ -14,7 +14,7 @@ import aurweb.db
 import aurweb.filters
 import aurweb.l10n
 
-from aurweb import db, logging
+from aurweb import aur_logging, db
 from aurweb.models import PackageBase, User
 from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_comment import PackageComment
@@ -23,7 +23,7 @@ from aurweb.models.package_request import PackageRequest
 from aurweb.models.request_type import RequestType
 from aurweb.models.tu_vote import TUVote
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 aur_location = aurweb.config.get('options', 'aur_location')
 
diff --git a/aurweb/scripts/rendercomment.py b/aurweb/scripts/rendercomment.py
index 87f8b89f..6a6bf621 100755
--- a/aurweb/scripts/rendercomment.py
+++ b/aurweb/scripts/rendercomment.py
@@ -11,10 +11,10 @@ import pygit2
 
 import aurweb.config
 
-from aurweb import db, logging, util
+from aurweb import aur_logging, db, util
 from aurweb.models import PackageComment
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 class LinkifyExtension(markdown.extensions.Extension):
diff --git a/aurweb/testing/alpm.py b/aurweb/testing/alpm.py
index ce30d042..e598c3d4 100644
--- a/aurweb/testing/alpm.py
+++ b/aurweb/testing/alpm.py
@@ -4,10 +4,10 @@ import re
 import shutil
 import subprocess
 
-from aurweb import logging, util
+from aurweb import aur_logging, util
 from aurweb.templates import base_template
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 class AlpmDatabase:
diff --git a/aurweb/testing/filelock.py b/aurweb/testing/filelock.py
index 3a18c153..3928722e 100644
--- a/aurweb/testing/filelock.py
+++ b/aurweb/testing/filelock.py
@@ -5,9 +5,9 @@ from typing import Callable
 
 from posix_ipc import O_CREAT, Semaphore
 
-from aurweb import logging
+from aurweb import aur_logging
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 def default_on_create(path):
diff --git a/aurweb/users/validate.py b/aurweb/users/validate.py
index de51e3ff..7e83a28d 100644
--- a/aurweb/users/validate.py
+++ b/aurweb/users/validate.py
@@ -9,7 +9,7 @@ when encountering invalid criteria and return silently otherwise.
 from fastapi import Request
 from sqlalchemy import and_
 
-from aurweb import config, db, l10n, logging, models, time, util
+from aurweb import aur_logging, config, db, l10n, models, time, util
 from aurweb.auth import creds
 from aurweb.captcha import get_captcha_answer, get_captcha_salts, get_captcha_token
 from aurweb.exceptions import ValidationError
@@ -17,7 +17,7 @@ from aurweb.models.account_type import ACCOUNT_TYPE_NAME
 from aurweb.models.ssh_pub_key import get_fingerprint
 from aurweb.util import strtobool
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 def invalid_fields(E: str = str(), U: str = str(), **kwargs) -> None:
diff --git a/aurweb/util.py b/aurweb/util.py
index 8291b578..de38d3b4 100644
--- a/aurweb/util.py
+++ b/aurweb/util.py
@@ -17,9 +17,9 @@ from fastapi.responses import JSONResponse
 
 import aurweb.config
 
-from aurweb import defaults, logging
+from aurweb import aur_logging, defaults
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 def make_random_string(length: int) -> str:
diff --git a/test/conftest.py b/test/conftest.py
index 283c979a..1ac72669 100644
--- a/test/conftest.py
+++ b/test/conftest.py
@@ -55,12 +55,12 @@ from sqlalchemy.orm import scoped_session
 import aurweb.config
 import aurweb.db
 
-from aurweb import initdb, logging, testing
+from aurweb import aur_logging, initdb, testing
 from aurweb.testing.email import Email
 from aurweb.testing.filelock import FileLock
 from aurweb.testing.git import GitRepository
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 # Synchronization lock for database setup.
 setup_lock = Lock()
diff --git a/test/test_accounts_routes.py b/test/test_accounts_routes.py
index 37b3d130..7a78fda7 100644
--- a/test/test_accounts_routes.py
+++ b/test/test_accounts_routes.py
@@ -13,7 +13,7 @@ from fastapi.testclient import TestClient
 
 import aurweb.models.account_type as at
 
-from aurweb import captcha, db, logging, time
+from aurweb import aur_logging, captcha, db, time
 from aurweb.asgi import app
 from aurweb.db import create, query
 from aurweb.models.accepted_term import AcceptedTerm
@@ -27,7 +27,7 @@ from aurweb.models.user import User
 from aurweb.testing.html import get_errors
 from aurweb.testing.requests import Request
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 # Some test global constants.
 TEST_USERNAME = "test"
diff --git a/test/test_asgi.py b/test/test_asgi.py
index c693a3a9..ca68e00e 100644
--- a/test/test_asgi.py
+++ b/test/test_asgi.py
@@ -12,8 +12,8 @@ from fastapi import HTTPException
 from fastapi.testclient import TestClient
 
 import aurweb.asgi
+import aurweb.aur_redis
 import aurweb.config
-import aurweb.redis
 
 from aurweb.exceptions import handle_form_exceptions
 from aurweb.testing.requests import Request
@@ -21,9 +21,9 @@ from aurweb.testing.requests import Request
 
 @pytest.fixture
 def setup(db_test, email_test):
-    aurweb.redis.redis_connection().flushall()
+    aurweb.aur_redis.redis_connection().flushall()
     yield
-    aurweb.redis.redis_connection().flushall()
+    aurweb.aur_redis.redis_connection().flushall()
 
 
 @pytest.fixture
diff --git a/test/test_homepage.py b/test/test_homepage.py
index 63b832e3..9d2fd4af 100644
--- a/test/test_homepage.py
+++ b/test/test_homepage.py
@@ -9,6 +9,7 @@ from fastapi.testclient import TestClient
 
 from aurweb import db, time
 from aurweb.asgi import app
+from aurweb.aur_redis import redis_connection
 from aurweb.models.account_type import USER_ID
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
@@ -16,7 +17,6 @@ from aurweb.models.package_comaintainer import PackageComaintainer
 from aurweb.models.package_request import PackageRequest
 from aurweb.models.request_type import DELETION_ID, RequestType
 from aurweb.models.user import User
-from aurweb.redis import redis_connection
 from aurweb.testing.html import parse_root
 from aurweb.testing.requests import Request
 
diff --git a/test/test_logging.py b/test/test_logging.py
index 63092d07..90d13c93 100644
--- a/test/test_logging.py
+++ b/test/test_logging.py
@@ -1,6 +1,6 @@
-from aurweb import logging
+from aurweb import aur_logging
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 def test_logging(caplog):
diff --git a/test/test_packages_util.py b/test/test_packages_util.py
index 02f84601..e3d03448 100644
--- a/test/test_packages_util.py
+++ b/test/test_packages_util.py
@@ -3,6 +3,7 @@ import pytest
 from fastapi.testclient import TestClient
 
 from aurweb import asgi, config, db, time
+from aurweb.aur_redis import kill_redis
 from aurweb.models.account_type import USER_ID
 from aurweb.models.official_provider import OFFICIAL_BASE, OfficialProvider
 from aurweb.models.package import Package
@@ -12,7 +13,6 @@ from aurweb.models.package_source import PackageSource
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.user import User
 from aurweb.packages import util
-from aurweb.redis import kill_redis
 
 
 @pytest.fixture(autouse=True)
diff --git a/test/test_ratelimit.py b/test/test_ratelimit.py
index 859adea9..54a0d89c 100644
--- a/test/test_ratelimit.py
+++ b/test/test_ratelimit.py
@@ -4,13 +4,13 @@ import pytest
 
 from redis.client import Pipeline
 
-from aurweb import config, db, logging
+from aurweb import aur_logging, config, db
+from aurweb.aur_redis import redis_connection
 from aurweb.models import ApiRateLimit
 from aurweb.ratelimit import check_ratelimit
-from aurweb.redis import redis_connection
 from aurweb.testing.requests import Request
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 @pytest.fixture(autouse=True)
diff --git a/test/test_redis.py b/test/test_redis.py
index 82aebb57..33a78457 100644
--- a/test/test_redis.py
+++ b/test/test_redis.py
@@ -4,11 +4,11 @@ import pytest
 
 import aurweb.config
 
-from aurweb.redis import redis_connection
+from aurweb.aur_redis import redis_connection
 
 
 @pytest.fixture
-def rediss():
+def redis():
     """ Create a RedisStub. """
     def mock_get(section, key):
         return "none"
@@ -21,20 +21,20 @@ def rediss():
     yield redis
 
 
-def test_redis_stub(rediss):
+def test_redis_stub(redis):
     # We don't yet have a test key set.
-    assert rediss.get("test") is None
+    assert redis.get("test") is None
 
     # Set the test key to abc.
-    rediss.set("test", "abc")
-    assert rediss.get("test").decode() == "abc"
+    redis.set("test", "abc")
+    assert redis.get("test").decode() == "abc"
 
     # Test expire.
-    rediss.expire("test", 0)
-    assert rediss.get("test") is None
+    redis.expire("test", 0)
+    assert redis.get("test") is None
 
     # Now, set the test key again and use delete() on it.
-    rediss.set("test", "abc")
-    assert rediss.get("test").decode() == "abc"
-    rediss.delete("test")
-    assert rediss.get("test") is None
+    redis.set("test", "abc")
+    assert redis.get("test").decode() == "abc"
+    redis.delete("test")
+    assert redis.get("test") is None
diff --git a/test/test_rendercomment.py b/test/test_rendercomment.py
index bf4009fd..fd99316b 100644
--- a/test/test_rendercomment.py
+++ b/test/test_rendercomment.py
@@ -2,14 +2,14 @@ from unittest import mock
 
 import pytest
 
-from aurweb import config, db, logging, time
+from aurweb import aur_logging, config, db, time
 from aurweb.models import Package, PackageBase, PackageComment, User
 from aurweb.models.account_type import USER_ID
 from aurweb.scripts import rendercomment
 from aurweb.scripts.rendercomment import update_comment_render
 from aurweb.testing.git import GitRepository
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 aur_location = config.get("options", "aur_location")
 
 
diff --git a/test/test_rpc.py b/test/test_rpc.py
index 0e24467a..ac865de0 100644
--- a/test/test_rpc.py
+++ b/test/test_rpc.py
@@ -13,6 +13,7 @@ import aurweb.models.dependency_type as dt
 import aurweb.models.relation_type as rt
 
 from aurweb import asgi, config, db, rpc, scripts, time
+from aurweb.aur_redis import redis_connection
 from aurweb.models.account_type import USER_ID
 from aurweb.models.dependency_type import DEPENDS_ID
 from aurweb.models.license import License
@@ -25,7 +26,6 @@ from aurweb.models.package_relation import PackageRelation
 from aurweb.models.package_vote import PackageVote
 from aurweb.models.relation_type import PROVIDES_ID
 from aurweb.models.user import User
-from aurweb.redis import redis_connection
 
 
 @pytest.fixture
diff --git a/test/test_rss.py b/test/test_rss.py
index cef6a46f..2058e15c 100644
--- a/test/test_rss.py
+++ b/test/test_rss.py
@@ -5,14 +5,14 @@ import pytest
 
 from fastapi.testclient import TestClient
 
-from aurweb import db, logging, time
+from aurweb import aur_logging, db, time
 from aurweb.asgi import app
 from aurweb.models.account_type import AccountType
 from aurweb.models.package import Package
 from aurweb.models.package_base import PackageBase
 from aurweb.models.user import User
 
-logger = logging.get_logger(__name__)
+logger = aur_logging.get_logger(__name__)
 
 
 @pytest.fixture(autouse=True)
-- 
GitLab