From 047077cee49dd4eb6f9f7b36a71ebcd966f0497d Mon Sep 17 00:00:00 2001
From: Christophe Bornet <cbornet@hotmail.com>
Date: Wed, 16 Oct 2024 00:55:10 +0200
Subject: [PATCH] ref: Remove autouse from pytest client fixture (#4158)

Remove autouse from pytest client fixture
---
 src/backend/tests/conftest.py                              | 2 +-
 src/backend/tests/integration/conftest.py                  | 6 ++++++
 .../tests/unit/base/tools/test_component_toolkit.py        | 7 +------
 .../unit/components/models/test_ChatOllama_component.py    | 5 -----
 .../tests/unit/components/prompts/test_prompt_component.py | 7 -------
 .../tests/unit/components/tools/test_python_repl_tool.py   | 7 -------
 .../tests/unit/components/tools/test_yfinance_tool.py      | 7 -------
 .../tests/unit/custom/component/test_component_to_tool.py  | 6 ------
 .../tests/unit/custom/custom_component/test_component.py   | 5 -----
 src/backend/tests/unit/events/test_event_manager.py        | 5 -----
 src/backend/tests/unit/graph/edge/test_edge_base.py        | 6 +-----
 .../tests/unit/graph/graph/state/test_state_model.py       | 5 -----
 src/backend/tests/unit/graph/graph/test_base.py            | 5 -----
 src/backend/tests/unit/graph/graph/test_callback_graph.py  | 6 ------
 src/backend/tests/unit/graph/graph/test_cycles.py          | 5 -----
 .../tests/unit/graph/graph/test_graph_state_model.py       | 5 -----
 .../unit/graph/graph/test_runnable_vertices_manager.py     | 5 -----
 src/backend/tests/unit/graph/graph/test_utils.py           | 5 -----
 src/backend/tests/unit/graph/test_graph.py                 | 5 -----
 .../starter_projects/test_vector_store_rag.py              | 5 -----
 src/backend/tests/unit/inputs/test_inputs.py               | 5 -----
 src/backend/tests/unit/io/test_io_schema.py                | 5 -----
 src/backend/tests/unit/io/test_table_schema.py             | 5 -----
 src/backend/tests/unit/schema/test_schema_message.py       | 5 -----
 src/backend/tests/unit/services/variable/test_service.py   | 5 -----
 src/backend/tests/unit/test_cli.py                         | 1 +
 src/backend/tests/unit/test_custom_component.py            | 5 -----
 src/backend/tests/unit/test_data_class.py                  | 5 -----
 src/backend/tests/unit/test_data_components.py             | 5 -----
 src/backend/tests/unit/test_experimental_components.py     | 6 ------
 src/backend/tests/unit/test_frontend_nodes.py              | 5 -----
 src/backend/tests/unit/test_helper_components.py           | 6 ------
 src/backend/tests/unit/test_initial_setup.py               | 1 +
 src/backend/tests/unit/test_loading.py                     | 7 -------
 src/backend/tests/unit/test_logger.py                      | 5 -----
 src/backend/tests/unit/test_messages.py                    | 5 +++++
 src/backend/tests/unit/test_schema.py                      | 5 -----
 src/backend/tests/unit/test_template.py                    | 5 -----
 src/backend/tests/unit/test_user.py                        | 2 +-
 src/backend/tests/unit/test_validate_code.py               | 5 -----
 .../tests/unit/utils/test_connection_string_parser.py      | 5 -----
 41 files changed, 17 insertions(+), 190 deletions(-)
 create mode 100644 src/backend/tests/integration/conftest.py

diff --git a/src/backend/tests/conftest.py b/src/backend/tests/conftest.py
index ac19e445b..56a2c6b86 100644
--- a/src/backend/tests/conftest.py
+++ b/src/backend/tests/conftest.py
@@ -273,7 +273,7 @@ def json_memory_chatbot_no_llm():
     return pytest.MEMORY_CHATBOT_NO_LLM.read_text()
 
 
-@pytest.fixture(name="client", autouse=True)
+@pytest.fixture(name="client")
 async def client_fixture(session: Session, monkeypatch, request, load_flows_dir):
     # Set the database url to a test database
     if "noclient" in request.keywords:
diff --git a/src/backend/tests/integration/conftest.py b/src/backend/tests/integration/conftest.py
new file mode 100644
index 000000000..d8dcd30aa
--- /dev/null
+++ b/src/backend/tests/integration/conftest.py
@@ -0,0 +1,6 @@
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def _start_app(client):
+    pass
diff --git a/src/backend/tests/unit/base/tools/test_component_toolkit.py b/src/backend/tests/unit/base/tools/test_component_toolkit.py
index d35740bcb..217e2572b 100644
--- a/src/backend/tests/unit/base/tools/test_component_toolkit.py
+++ b/src/backend/tests/unit/base/tools/test_component_toolkit.py
@@ -12,11 +12,6 @@ from langflow.schema.message import Message
 from langflow.services.settings.feature_flags import FEATURE_FLAGS
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.fixture
 def add_toolkit_output():
     FEATURE_FLAGS.add_toolkit_output = True
@@ -87,7 +82,7 @@ def test_component_tool():
 
 
 @pytest.mark.api_key_required
-@pytest.mark.usefixtures("add_toolkit_output")
+@pytest.mark.usefixtures("add_toolkit_output", "client")
 def test_component_tool_with_api_key():
     chat_output = ChatOutput()
     openai_llm = OpenAIModelComponent()
diff --git a/src/backend/tests/unit/components/models/test_ChatOllama_component.py b/src/backend/tests/unit/components/models/test_ChatOllama_component.py
index 637e78064..fcd7b20e3 100644
--- a/src/backend/tests/unit/components/models/test_ChatOllama_component.py
+++ b/src/backend/tests/unit/components/models/test_ChatOllama_component.py
@@ -7,11 +7,6 @@ from langchain_community.chat_models.ollama import ChatOllama
 from langflow.components.models.OllamaModel import ChatOllamaComponent
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.fixture
 def component():
     return ChatOllamaComponent()
diff --git a/src/backend/tests/unit/components/prompts/test_prompt_component.py b/src/backend/tests/unit/components/prompts/test_prompt_component.py
index 8f8494013..0efbd93e7 100644
--- a/src/backend/tests/unit/components/prompts/test_prompt_component.py
+++ b/src/backend/tests/unit/components/prompts/test_prompt_component.py
@@ -1,13 +1,6 @@
-import pytest
-
 from langflow.components.prompts.Prompt import PromptComponent  # type: ignore
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 class TestPromptComponent:
     def test_post_code_processing(self):
         component = PromptComponent(template="Hello {name}!", name="John")
diff --git a/src/backend/tests/unit/components/tools/test_python_repl_tool.py b/src/backend/tests/unit/components/tools/test_python_repl_tool.py
index c5be4ba85..7115e000f 100644
--- a/src/backend/tests/unit/components/tools/test_python_repl_tool.py
+++ b/src/backend/tests/unit/components/tools/test_python_repl_tool.py
@@ -1,15 +1,8 @@
-import pytest
-
 from langflow.components.tools.PythonREPLTool import PythonREPLToolComponent
 from langflow.custom.custom_component.component import Component
 from langflow.custom.utils import build_custom_component_template
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 def test_python_repl_tool_template():
     python_repl_tool = PythonREPLToolComponent()
     component = Component(_code=python_repl_tool._code)
diff --git a/src/backend/tests/unit/components/tools/test_yfinance_tool.py b/src/backend/tests/unit/components/tools/test_yfinance_tool.py
index 75630a42d..da5b3813b 100644
--- a/src/backend/tests/unit/components/tools/test_yfinance_tool.py
+++ b/src/backend/tests/unit/components/tools/test_yfinance_tool.py
@@ -1,15 +1,8 @@
-import pytest
-
 from langflow.components.tools.YfinanceTool import YfinanceToolComponent
 from langflow.custom.custom_component.component import Component
 from langflow.custom.utils import build_custom_component_template
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 def test_yfinance_tool_template():
     yf_tool = YfinanceToolComponent()
     component = Component(_code=yf_tool._code)
diff --git a/src/backend/tests/unit/custom/component/test_component_to_tool.py b/src/backend/tests/unit/custom/component/test_component_to_tool.py
index df8e7cbf7..d8659c057 100644
--- a/src/backend/tests/unit/custom/component/test_component_to_tool.py
+++ b/src/backend/tests/unit/custom/component/test_component_to_tool.py
@@ -1,15 +1,9 @@
 from collections.abc import Callable
 
-import pytest
 
 from langflow.components.inputs.ChatInput import ChatInput
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 def test_component_to_toolkit():
     chat_input = ChatInput()
     tools = chat_input.to_toolkit()
diff --git a/src/backend/tests/unit/custom/custom_component/test_component.py b/src/backend/tests/unit/custom/custom_component/test_component.py
index be67c774d..7706a6904 100644
--- a/src/backend/tests/unit/custom/custom_component/test_component.py
+++ b/src/backend/tests/unit/custom/custom_component/test_component.py
@@ -9,11 +9,6 @@ from langflow.components.outputs import ChatOutput
 from langflow.template.field.base import Output
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 def test_set_invalid_output():
     chatinput = ChatInput()
     chatoutput = ChatOutput()
diff --git a/src/backend/tests/unit/events/test_event_manager.py b/src/backend/tests/unit/events/test_event_manager.py
index 98d19a15e..241ed6fec 100644
--- a/src/backend/tests/unit/events/test_event_manager.py
+++ b/src/backend/tests/unit/events/test_event_manager.py
@@ -9,11 +9,6 @@ from langflow.events.event_manager import EventManager
 from langflow.schema.log import LoggableType
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 class TestEventManager:
     # Registering an event with a valid name and callback using a mock callback function
     def test_register_event_with_valid_name_and_callback_with_mock_callback(self):
diff --git a/src/backend/tests/unit/graph/edge/test_edge_base.py b/src/backend/tests/unit/graph/edge/test_edge_base.py
index d2d1db5d4..74c7b73ad 100644
--- a/src/backend/tests/unit/graph/edge/test_edge_base.py
+++ b/src/backend/tests/unit/graph/edge/test_edge_base.py
@@ -7,11 +7,7 @@ from langflow.components.prompts.Prompt import PromptComponent
 from langflow.graph.graph.base import Graph
 
 
-@pytest.fixture
-def client():
-    pass
-
-
+@pytest.mark.usefixtures("client")
 def test_edge_raises_error_on_invalid_target_handle():
     template = """Answer the user as if you were a pirate.
 
diff --git a/src/backend/tests/unit/graph/graph/state/test_state_model.py b/src/backend/tests/unit/graph/graph/state/test_state_model.py
index 1c1e800ca..afa3e3c02 100644
--- a/src/backend/tests/unit/graph/graph/state/test_state_model.py
+++ b/src/backend/tests/unit/graph/graph/state/test_state_model.py
@@ -9,11 +9,6 @@ from langflow.graph.state.model import create_state_model
 from langflow.template.field.base import UNDEFINED
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.fixture
 def chat_input_component():
     return ChatInput()
diff --git a/src/backend/tests/unit/graph/graph/test_base.py b/src/backend/tests/unit/graph/graph/test_base.py
index 8a7e32814..b9baa88fd 100644
--- a/src/backend/tests/unit/graph/graph/test_base.py
+++ b/src/backend/tests/unit/graph/graph/test_base.py
@@ -13,11 +13,6 @@ from langflow.graph.graph.base import Graph
 from langflow.graph.graph.constants import Finish
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.mark.asyncio
 async def test_graph_not_prepared():
     chat_input = ChatInput()
diff --git a/src/backend/tests/unit/graph/graph/test_callback_graph.py b/src/backend/tests/unit/graph/graph/test_callback_graph.py
index cd2cbf815..fe175cab5 100644
--- a/src/backend/tests/unit/graph/graph/test_callback_graph.py
+++ b/src/backend/tests/unit/graph/graph/test_callback_graph.py
@@ -1,6 +1,5 @@
 import asyncio
 
-import pytest
 
 from langflow.components.outputs.ChatOutput import ChatOutput
 from langflow.custom.custom_component.component import Component
@@ -11,11 +10,6 @@ from langflow.schema.message import Message
 from langflow.template.field.base import Output
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 class LogComponent(Component):
     name = "LogComponent"
     inputs = [IntInput(name="times", value=1)]
diff --git a/src/backend/tests/unit/graph/graph/test_cycles.py b/src/backend/tests/unit/graph/graph/test_cycles.py
index 573ec6f03..0c388e5d9 100644
--- a/src/backend/tests/unit/graph/graph/test_cycles.py
+++ b/src/backend/tests/unit/graph/graph/test_cycles.py
@@ -15,11 +15,6 @@ from langflow.io import MessageTextInput, Output
 from langflow.schema.message import Message
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 class Concatenate(Component):
     display_name = "Concatenate"
     description = "Concatenates two strings"
diff --git a/src/backend/tests/unit/graph/graph/test_graph_state_model.py b/src/backend/tests/unit/graph/graph/test_graph_state_model.py
index afdb23e15..88eae9ec6 100644
--- a/src/backend/tests/unit/graph/graph/test_graph_state_model.py
+++ b/src/backend/tests/unit/graph/graph/test_graph_state_model.py
@@ -11,11 +11,6 @@ from langflow.graph.graph.constants import Finish
 from langflow.graph.graph.state_model import create_state_model_from_graph
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 def test_graph_state_model():
     session_id = "test_session_id"
     template = """{context}
diff --git a/src/backend/tests/unit/graph/graph/test_runnable_vertices_manager.py b/src/backend/tests/unit/graph/graph/test_runnable_vertices_manager.py
index f42b2e949..b3a803657 100644
--- a/src/backend/tests/unit/graph/graph/test_runnable_vertices_manager.py
+++ b/src/backend/tests/unit/graph/graph/test_runnable_vertices_manager.py
@@ -6,11 +6,6 @@ import pytest
 from langflow.graph.graph.runnable_vertices_manager import RunnableVerticesManager
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.fixture
 def data():
     run_map: defaultdict(list) = {"A": ["B", "C"], "B": ["D"], "C": ["D"], "D": []}
diff --git a/src/backend/tests/unit/graph/graph/test_utils.py b/src/backend/tests/unit/graph/graph/test_utils.py
index 54c478802..68150b0c9 100644
--- a/src/backend/tests/unit/graph/graph/test_utils.py
+++ b/src/backend/tests/unit/graph/graph/test_utils.py
@@ -5,11 +5,6 @@ import pytest
 from langflow.graph.graph import utils
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.fixture
 def graph():
     return {
diff --git a/src/backend/tests/unit/graph/test_graph.py b/src/backend/tests/unit/graph/test_graph.py
index 0a96a748c..62992093b 100644
--- a/src/backend/tests/unit/graph/test_graph.py
+++ b/src/backend/tests/unit/graph/test_graph.py
@@ -22,11 +22,6 @@ from langflow.initial_setup.setup import load_starter_projects
 # BASIC_EXAMPLE_PATH, COMPLEX_EXAMPLE_PATH, OPENAPI_EXAMPLE_PATH
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.fixture
 def sample_template():
     return {
diff --git a/src/backend/tests/unit/initial_setup/starter_projects/test_vector_store_rag.py b/src/backend/tests/unit/initial_setup/starter_projects/test_vector_store_rag.py
index d2d948970..5307c33b7 100644
--- a/src/backend/tests/unit/initial_setup/starter_projects/test_vector_store_rag.py
+++ b/src/backend/tests/unit/initial_setup/starter_projects/test_vector_store_rag.py
@@ -17,11 +17,6 @@ from langflow.graph.graph.constants import Finish
 from langflow.schema.data import Data
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.fixture
 def ingestion_graph():
     # Ingestion Graph
diff --git a/src/backend/tests/unit/inputs/test_inputs.py b/src/backend/tests/unit/inputs/test_inputs.py
index f8b7c7796..9ce18e8f0 100644
--- a/src/backend/tests/unit/inputs/test_inputs.py
+++ b/src/backend/tests/unit/inputs/test_inputs.py
@@ -26,11 +26,6 @@ from langflow.inputs.utils import instantiate_input
 from langflow.schema.message import Message
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 def test_table_input_valid():
     data = TableInput(name="valid_table", value=[{"key": "value"}, {"key2": "value2"}])
     assert data.value == [{"key": "value"}, {"key2": "value2"}]
diff --git a/src/backend/tests/unit/io/test_io_schema.py b/src/backend/tests/unit/io/test_io_schema.py
index 97caead0b..f36356db9 100644
--- a/src/backend/tests/unit/io/test_io_schema.py
+++ b/src/backend/tests/unit/io/test_io_schema.py
@@ -6,11 +6,6 @@ from pydantic.fields import FieldInfo
 from langflow.components.inputs.ChatInput import ChatInput
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 def test_create_input_schema():
     from langflow.io.schema import create_input_schema
 
diff --git a/src/backend/tests/unit/io/test_table_schema.py b/src/backend/tests/unit/io/test_table_schema.py
index cefa5f82f..d26fa7444 100644
--- a/src/backend/tests/unit/io/test_table_schema.py
+++ b/src/backend/tests/unit/io/test_table_schema.py
@@ -5,11 +5,6 @@ import pytest
 from langflow.schema.table import Column, FormatterType
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 class TestColumn:
     # Creating a Column instance without display_name sets it to the name
     def test_create_column_without_display_name(self):
diff --git a/src/backend/tests/unit/schema/test_schema_message.py b/src/backend/tests/unit/schema/test_schema_message.py
index 846ca4d61..cc96f67f3 100644
--- a/src/backend/tests/unit/schema/test_schema_message.py
+++ b/src/backend/tests/unit/schema/test_schema_message.py
@@ -4,11 +4,6 @@ from langchain_core.prompts.chat import ChatPromptTemplate
 from langflow.schema.message import Message
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.mark.asyncio
 async def test_message_async_prompt_serialization():
     template = "Hello, {name}!"
diff --git a/src/backend/tests/unit/services/variable/test_service.py b/src/backend/tests/unit/services/variable/test_service.py
index cb3a7824c..4c0bb7bcb 100644
--- a/src/backend/tests/unit/services/variable/test_service.py
+++ b/src/backend/tests/unit/services/variable/test_service.py
@@ -11,11 +11,6 @@ from langflow.services.variable.constants import CREDENTIAL_TYPE, GENERIC_TYPE
 from langflow.services.variable.service import DatabaseVariableService
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.fixture
 def service():
     settings_service = get_settings_service()
diff --git a/src/backend/tests/unit/test_cli.py b/src/backend/tests/unit/test_cli.py
index 2014d5bf0..6812a784c 100644
--- a/src/backend/tests/unit/test_cli.py
+++ b/src/backend/tests/unit/test_cli.py
@@ -12,6 +12,7 @@ def default_settings():
     ]
 
 
+@pytest.mark.usefixtures("client")
 def test_components_path(runner, default_settings, tmp_path):
     # create a "components" folder
     temp_dir = tmp_path / "components"
diff --git a/src/backend/tests/unit/test_custom_component.py b/src/backend/tests/unit/test_custom_component.py
index 74615d8c6..6c956e436 100644
--- a/src/backend/tests/unit/test_custom_component.py
+++ b/src/backend/tests/unit/test_custom_component.py
@@ -12,11 +12,6 @@ from langflow.custom.custom_component.base_component import BaseComponent, Compo
 from langflow.custom.utils import build_custom_component_template
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.fixture
 def code_component_with_multiple_outputs():
     code = Path("src/backend/tests/data/component_multiple_outputs.py").read_text()
diff --git a/src/backend/tests/unit/test_data_class.py b/src/backend/tests/unit/test_data_class.py
index 6e7374f8b..dadc790e5 100644
--- a/src/backend/tests/unit/test_data_class.py
+++ b/src/backend/tests/unit/test_data_class.py
@@ -4,11 +4,6 @@ from langchain_core.documents import Document
 from langflow.schema import Data
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 def test_data_initialization():
     record = Data(text_key="msg", data={"msg": "Hello, World!", "extra": "value"})
     assert record.msg == "Hello, World!"
diff --git a/src/backend/tests/unit/test_data_components.py b/src/backend/tests/unit/test_data_components.py
index fa8e180a5..88daf94b8 100644
--- a/src/backend/tests/unit/test_data_components.py
+++ b/src/backend/tests/unit/test_data_components.py
@@ -10,11 +10,6 @@ from httpx import Response
 from langflow.components import data
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.fixture
 def api_request():
     # This fixture provides an instance of APIRequest for each test case
diff --git a/src/backend/tests/unit/test_experimental_components.py b/src/backend/tests/unit/test_experimental_components.py
index 50a363f4a..e4f6593f2 100644
--- a/src/backend/tests/unit/test_experimental_components.py
+++ b/src/backend/tests/unit/test_experimental_components.py
@@ -1,10 +1,4 @@
 from langflow.components import prototypes
-import pytest
-
-
-@pytest.fixture
-def client():
-    pass
 
 
 def test_python_function_component():
diff --git a/src/backend/tests/unit/test_frontend_nodes.py b/src/backend/tests/unit/test_frontend_nodes.py
index 098d7b640..97a3db984 100644
--- a/src/backend/tests/unit/test_frontend_nodes.py
+++ b/src/backend/tests/unit/test_frontend_nodes.py
@@ -5,11 +5,6 @@ from langflow.template.frontend_node.base import FrontendNode
 from langflow.template.template.base import Template
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.fixture
 def sample_template_field() -> Input:
     return Input(name="test_field", field_type="str")
diff --git a/src/backend/tests/unit/test_helper_components.py b/src/backend/tests/unit/test_helper_components.py
index 97fc90df0..44012c210 100644
--- a/src/backend/tests/unit/test_helper_components.py
+++ b/src/backend/tests/unit/test_helper_components.py
@@ -4,12 +4,6 @@ from langflow.components import helpers
 from langflow.custom.utils import build_custom_component_template
 from langflow.schema import Data
 from langflow.schema.message import Message
-import pytest
-
-
-@pytest.fixture
-def client():
-    pass
 
 
 # def test_update_data_component():
diff --git a/src/backend/tests/unit/test_initial_setup.py b/src/backend/tests/unit/test_initial_setup.py
index 9110376d7..b906e9106 100644
--- a/src/backend/tests/unit/test_initial_setup.py
+++ b/src/backend/tests/unit/test_initial_setup.py
@@ -49,6 +49,7 @@ def test_get_project_data():
 
 
 @pytest.mark.asyncio
+@pytest.mark.usefixtures("client")
 async def test_create_or_update_starter_projects():
     with session_scope() as session:
         # Get the number of projects returned by load_starter_projects
diff --git a/src/backend/tests/unit/test_loading.py b/src/backend/tests/unit/test_loading.py
index eaff7d17f..a8fcbfb11 100644
--- a/src/backend/tests/unit/test_loading.py
+++ b/src/backend/tests/unit/test_loading.py
@@ -1,15 +1,8 @@
-import pytest
-
 from langflow.graph import Graph
 from langflow.initial_setup.setup import load_starter_projects
 from langflow.load import load_flow_from_json
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 # TODO: UPDATE BASIC EXAMPLE
 # def test_load_flow_from_json():
 #     """Test loading a flow from a json file"""
diff --git a/src/backend/tests/unit/test_logger.py b/src/backend/tests/unit/test_logger.py
index 91fa66a75..e86c703d2 100644
--- a/src/backend/tests/unit/test_logger.py
+++ b/src/backend/tests/unit/test_logger.py
@@ -5,11 +5,6 @@ from unittest.mock import patch
 from langflow.logging.logger import SizedLogBuffer
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.fixture
 def sized_log_buffer():
     return SizedLogBuffer()
diff --git a/src/backend/tests/unit/test_messages.py b/src/backend/tests/unit/test_messages.py
index 5ae53bb34..e4a4673c1 100644
--- a/src/backend/tests/unit/test_messages.py
+++ b/src/backend/tests/unit/test_messages.py
@@ -36,6 +36,7 @@ def created_messages(session):
         return messages_read
 
 
+@pytest.mark.usefixtures("client")
 def test_get_messages():
     add_messages(
         [
@@ -49,6 +50,7 @@ def test_get_messages():
     assert messages[1].text == "Test message 2"
 
 
+@pytest.mark.usefixtures("client")
 def test_add_messages():
     message = Message(text="New Test message", sender="User", sender_name="User", session_id="new_session_id")
     messages = add_messages(message)
@@ -56,6 +58,7 @@ def test_add_messages():
     assert messages[0].text == "New Test message"
 
 
+@pytest.mark.usefixtures("client")
 def test_add_messagetables(session):
     messages = [MessageTable(text="New Test message", sender="User", sender_name="User", session_id="new_session_id")]
     added_messages = add_messagetables(messages, session)
@@ -63,6 +66,7 @@ def test_add_messagetables(session):
     assert added_messages[0].text == "New Test message"
 
 
+@pytest.mark.usefixtures("client")
 def test_delete_messages(session):
     session_id = "session_id2"
     delete_messages(session_id)
@@ -70,6 +74,7 @@ def test_delete_messages(session):
     assert len(messages) == 0
 
 
+@pytest.mark.usefixtures("client")
 def test_store_message():
     message = Message(text="Stored message", sender="User", sender_name="User", session_id="stored_session_id")
     stored_messages = store_message(message)
diff --git a/src/backend/tests/unit/test_schema.py b/src/backend/tests/unit/test_schema.py
index 68128ef28..3e4003edf 100644
--- a/src/backend/tests/unit/test_schema.py
+++ b/src/backend/tests/unit/test_schema.py
@@ -11,11 +11,6 @@ from langflow.type_extraction.type_extraction import post_process_type
 from collections.abc import Sequence as SequenceABC
 
 
-@pytest.fixture(name="client", autouse=True)
-def client_fixture():
-    pass
-
-
 class TestInput:
     def test_field_type_str(self):
         input_obj = Input(field_type="str")
diff --git a/src/backend/tests/unit/test_template.py b/src/backend/tests/unit/test_template.py
index b9b38f2fc..f9dd2dfce 100644
--- a/src/backend/tests/unit/test_template.py
+++ b/src/backend/tests/unit/test_template.py
@@ -5,11 +5,6 @@ from langflow.utils.util import build_template_from_function, get_base_classes,
 from pydantic import BaseModel
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 # Dummy classes for testing purposes
 class Parent(BaseModel):
     """Parent Class"""
diff --git a/src/backend/tests/unit/test_user.py b/src/backend/tests/unit/test_user.py
index c2ac63b11..27af57784 100644
--- a/src/backend/tests/unit/test_user.py
+++ b/src/backend/tests/unit/test_user.py
@@ -39,7 +39,7 @@ async def super_user_headers(client: AsyncClient, super_user):
 
 
 @pytest.fixture
-def deactivated_user():
+def deactivated_user(client):
     with session_getter(get_db_service()) as session:
         user = User(
             username="deactivateduser",
diff --git a/src/backend/tests/unit/test_validate_code.py b/src/backend/tests/unit/test_validate_code.py
index 6d4e5c421..a30fd6191 100644
--- a/src/backend/tests/unit/test_validate_code.py
+++ b/src/backend/tests/unit/test_validate_code.py
@@ -7,11 +7,6 @@ from requests.exceptions import MissingSchema
 from langflow.utils.validate import create_function, execute_function, extract_function_name, validate_code
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 def test_create_function():
     code = """
 from pathlib import Path
diff --git a/src/backend/tests/unit/utils/test_connection_string_parser.py b/src/backend/tests/unit/utils/test_connection_string_parser.py
index 1ab82279e..c3e3ec860 100644
--- a/src/backend/tests/unit/utils/test_connection_string_parser.py
+++ b/src/backend/tests/unit/utils/test_connection_string_parser.py
@@ -2,11 +2,6 @@ import pytest
 from langflow.utils.connection_string_parser import transform_connection_string
 
 
-@pytest.fixture
-def client():
-    pass
-
-
 @pytest.mark.parametrize(
     "connection_string, expected",
     [