[chore][tests][anchor the rollback tests away from the shared file tail]

Author: ayaangazali

tests/structs/test_agent.py

@@ -2468,92 +2468,6 @@ def test_unset_credentials_are_omitted_from_the_provider_call(
         print("✓ Default path leaves both out")
 
 
-# ============================================================================
-# CONTEXT LENGTH
-# ============================================================================
-
-
-class TestContextLength:
-    """context_length must survive __init__ and reach the Conversation."""
-
-    @staticmethod
-    def _agent(**kwargs):
-        with patch("swarms.structs.agent.LiteLLM"):
-            return Agent(
-                agent_name="ctx_agent",
-                max_loops=1,
-                print_on=False,
-                verbose=False,
-                persistent_memory=False,
-                **kwargs,
-            )
-
-    def test_explicit_value_is_honoured(self):
-        """The constructor argument used to be overwritten with 16000."""
-        agent = self._agent(
-            model_name="gpt-4.1", context_length=200000
-        )
-
-        assert agent.context_length == 200000
-        assert agent.short_memory.context_length == 200000
-
-    def test_default_uses_the_model_input_window(self):
-        """Omitting it should size to the model, not a flat 16000."""
-        agent = self._agent(model_name="gpt-4o")
-
-        # gpt-4o's input window is far above the old hardcoded default;
-        # asserting the relation rather than the literal keeps this from
-        # breaking when litellm refreshes its model table.
-        assert agent.context_length > 16000
-
-    def test_unknown_model_falls_back(self):
-        """An unrecognised model must not raise out of __init__."""
-        agent = self._agent(model_name="totally-made-up-model-xyz")
-
-        assert agent.context_length == 16000
-
-
-# ============================================================================
-# TOOLS LIST ISOLATION
-# ============================================================================
-
-
-class TestToolsListIsolation:
-    """tools_list_dictionary must not be shared between Agent instances."""
-
-    @staticmethod
-    def _agent(name, **kwargs):
-        with patch("swarms.structs.agent.LiteLLM"):
-            return Agent(
-                agent_name=name,
-                model_name="gpt-5.4",
-                max_loops=1,
-                print_on=False,
-                verbose=False,
-                persistent_memory=False,
-                **kwargs,
-            )
-
-    def test_default_is_per_instance(self):
-        """One agent's tools must not reach another, or the next one."""
-        first = self._agent("First")
-        second = self._agent("Second")
-        first.tools_list_dictionary.append(
-            {"function": {"name": "x"}}
-        )
-
-        assert second.tools_list_dictionary == []
-        # a fresh agent too: the old pollution outlived agents on __defaults__
-        assert self._agent("Third").tools_list_dictionary == []
-        given = [{"function": {"name": "given"}}]
-        assert (
-            self._agent(
-                "Fourth", tools_list_dictionary=given
-            ).tools_list_dictionary
-            == given
-        )
-
-
 # ============================================================================
 # RETRY MEMORY ROLLBACK
 # ============================================================================
@@ -2642,6 +2556,92 @@ def test_rollback_also_rewinds_memory_md(self, tmp_path):
         assert "keep me" in contents
 
 
+# ============================================================================
+# CONTEXT LENGTH
+# ============================================================================
+
+
+class TestContextLength:
+    """context_length must survive __init__ and reach the Conversation."""
+
+    @staticmethod
+    def _agent(**kwargs):
+        with patch("swarms.structs.agent.LiteLLM"):
+            return Agent(
+                agent_name="ctx_agent",
+                max_loops=1,
+                print_on=False,
+                verbose=False,
+                persistent_memory=False,
+                **kwargs,
+            )
+
+    def test_explicit_value_is_honoured(self):
+        """The constructor argument used to be overwritten with 16000."""
+        agent = self._agent(
+            model_name="gpt-4.1", context_length=200000
+        )
+
+        assert agent.context_length == 200000
+        assert agent.short_memory.context_length == 200000
+
+    def test_default_uses_the_model_input_window(self):
+        """Omitting it should size to the model, not a flat 16000."""
+        agent = self._agent(model_name="gpt-4o")
+
+        # gpt-4o's input window is far above the old hardcoded default;
+        # asserting the relation rather than the literal keeps this from
+        # breaking when litellm refreshes its model table.
+        assert agent.context_length > 16000
+
+    def test_unknown_model_falls_back(self):
+        """An unrecognised model must not raise out of __init__."""
+        agent = self._agent(model_name="totally-made-up-model-xyz")
+
+        assert agent.context_length == 16000
+
+
+# ============================================================================
+# TOOLS LIST ISOLATION
+# ============================================================================
+
+
+class TestToolsListIsolation:
+    """tools_list_dictionary must not be shared between Agent instances."""
+
+    @staticmethod
+    def _agent(name, **kwargs):
+        with patch("swarms.structs.agent.LiteLLM"):
+            return Agent(
+                agent_name=name,
+                model_name="gpt-5.4",
+                max_loops=1,
+                print_on=False,
+                verbose=False,
+                persistent_memory=False,
+                **kwargs,
+            )
+
+    def test_default_is_per_instance(self):
+        """One agent's tools must not reach another, or the next one."""
+        first = self._agent("First")
+        second = self._agent("Second")
+        first.tools_list_dictionary.append(
+            {"function": {"name": "x"}}
+        )
+
+        assert second.tools_list_dictionary == []
+        # a fresh agent too: the old pollution outlived agents on __defaults__
+        assert self._agent("Third").tools_list_dictionary == []
+        given = [{"function": {"name": "given"}}]
+        assert (
+            self._agent(
+                "Fourth", tools_list_dictionary=given
+            ).tools_list_dictionary
+            == given
+        )
+
+
 # ============================================================================
 # MAIN TEST RUNNER
 # ============================================================================