chore: bad conflict resolution skills

api/tests/opentrons/cli/test_cli.py

@@ -20,16 +20,6 @@
 # Enable tracking for the RobotContextTracker
 # This must come before the import of the analyze CLI
 context_tracker = _get_robot_context_tracker()
-@pytest.mark.usefixtures("override_data_store")
-def test_track_analysis(tmp_path: Path) -> None:
-    """Test that the RobotContextTracker tracks analysis."""
-…        requirements = {"apiLevel": "2.15"}
-
-        def run(protocol):
-            pass
-        """
-    )
-    protocol_source_file = tmp_path / "protocol.py"
 
 # Ignore the type error for the next line, as we're setting a private attribute for testing purposes
 context_tracker._should_track = True  # type: ignore[attr-defined]
@@ -52,7 +42,7 @@ def override_data_store(tmp_path: Path) -> Iterator[None]:
 @pytest.fixture
 def monkeypatch_set_store_each_to_true(monkeypatch: pytest.MonkeyPatch) -> None:
     """Override the STORE_EACH flag for the RobotContextTracker."""
-    context_tracker._store_each = True  # type: ignore[attr-defined]
+    monkeypatch.setattr(context_tracker, "_store_each", True)
 
 
 def verify_metrics_store_file(file_path: Path, expected_length: int) -> None: