test(cli-context): force CLI context off in no_cli_context fixture

The no_cli_context conftest branch previously only skipped enabling the
CLI context; it now actively sets the ContextVar to False and restores it
on teardown. mark_cli_invocation() is set-and-leave, so the opt-out now
guarantees a disabled context independent of test order rather than
relying on the default plus async-task context isolation.

Removes the now-redundant local _reset_cli_context fixture in
test_cli_context.py; the guarantee lives once, in conftest.

Author: deanq

tests/conftest.py

@@ -17,7 +17,7 @@
 
 import pytest
 
-from runpod_flash.core.cli_context import allow_lifecycle_operations
+from runpod_flash.core.cli_context import _invoked_by_cli, allow_lifecycle_operations
 from runpod_flash.core.resources.resource_manager import ResourceManager
 from runpod_flash.core.utils.singleton import SingletonMixin
 
@@ -44,9 +44,19 @@ def _flash_cli_context(request):
     Lifecycle methods (deploy/undeploy/app/env management) are restricted to
     flash CLI invocation. Most tests drive them directly, so enable the context
     by default. Guard tests opt out with @pytest.mark.no_cli_context.
+
+    The opt-out branch actively forces the context to False (rather than merely
+    skipping the enable) and restores it afterwards. ``mark_cli_invocation()`` is
+    set-and-leave, so a CLI test that ran earlier in the same worker could leave
+    the ContextVar True; forcing False here makes guard tests independent of test
+    order instead of relying on each guard module to reset the var itself.
     """
     if request.node.get_closest_marker("no_cli_context"):
-        yield
+        token = _invoked_by_cli.set(False)
+        try:
+            yield
+        finally:
+            _invoked_by_cli.reset(token)
     else:
         with allow_lifecycle_operations():
             yield

tests/unit/core/test_cli_context.py

@@ -12,23 +12,15 @@
     cli_only,
     is_cli_invocation,
     mark_cli_invocation,
-    _invoked_by_cli,
 )
 from runpod_flash.core.exceptions import FlashError, FlashUsageError
 
+# The conftest ``_flash_cli_context`` fixture forces the CLI context to False for
+# every no_cli_context test and restores it afterwards, so these tests start from
+# a clean default regardless of order.
 pytestmark = pytest.mark.no_cli_context
 
 
-@pytest.fixture(autouse=True)
-def _reset_cli_context():
-    """Guarantee a clean default (False) context around each test."""
-    token = _invoked_by_cli.set(False)
-    try:
-        yield
-    finally:
-        _invoked_by_cli.reset(token)
-
-
 @cli_only("flash deploy")
 async def _guarded(value: int) -> int:
     return value * 2