Rebase fixes

mozilla-services · Nov 16, 2022 · 31ae51b · 31ae51b
1 parent 446f0d1
commit 31ae51b
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 2 deletions.
diff --git a/merino/middleware/logging.py b/merino/middleware/logging.py
@@ -8,7 +8,7 @@
 from starlette.requests import Request
 from starlette.types import ASGIApp, Message, Receive, Scope, Send
 
-from merino.util.log_data_creators import (
+from merino.utils.log_data_creators import (
     create_request_summary_log_data,
     create_suggest_log_data,
 )

diff --git a/tests/unit/util/__init__.py → tests/unit/utils/__init__.py b/tests/unit/util/__init__.py → tests/unit/utils/__init__.py
diff --git a/tests/unit/util/test_log_data_creator.py → tests/unit/utils/test_log_data_creator.py b/tests/unit/util/test_log_data_creator.py → tests/unit/utils/test_log_data_creator.py
@@ -14,7 +14,7 @@
 from merino.middleware import ScopeKey
 from merino.middleware.geolocation import Location
 from merino.middleware.user_agent import UserAgent
-from merino.util.log_data_creators import (
+from merino.utils.log_data_creators import (
     create_request_summary_log_data,
     create_suggest_log_data,
 )

diff --git a/tests/unit/test_task_runner.py → tests/unit/utils/test_task_runner.py b/tests/unit/test_task_runner.py → tests/unit/utils/test_task_runner.py
diff --git a/tests/unit/util/test_user_agent_parsing.py → tests/unit/utils/test_user_agent_parsing.py b/tests/unit/util/test_user_agent_parsing.py → tests/unit/utils/test_user_agent_parsing.py