Merge remote-tracking branch 'upstream/main' into tag-groups

# Conflicts:
#	bot/converters.py
#	bot/exts/info/tags.py
#	tests/bot/test_converters.py

1 files changed, 2 insertions, 1 deletions

diff --git a/tests/base.py b/tests/base.py
index d99b9ac31..ab9287e9a 100644
--- a/tests/base.py
+++ b/tests/base.py
@@ -6,6 +6,7 @@ from typing import Dict
 import discord
 from discord.ext import commands
 
+from bot.log import get_logger
 from tests import helpers
 
 
@@ -42,7 +43,7 @@ class LoggingTestsMixin:
         manager when we're testing under the assumption that no log records will be emitted.
         """
         if not isinstance(logger, logging.Logger):
-            logger = logging.getLogger(logger)
+            logger = get_logger(logger)
 
         if level:
             level = logging._nameToLevel.get(level, level)