diff --git a/sdk/python/tests/pinned_app_server_helpers.py b/sdk/python/tests/app_server_helpers.py similarity index 100% rename from sdk/python/tests/pinned_app_server_helpers.py rename to sdk/python/tests/app_server_helpers.py diff --git a/sdk/python/tests/test_pinned_app_server_approval_modes_integration.py b/sdk/python/tests/test_app_server_approvals.py similarity index 99% rename from sdk/python/tests/test_pinned_app_server_approval_modes_integration.py rename to sdk/python/tests/test_app_server_approvals.py index 12200f8102..61e5703dd7 100644 --- a/sdk/python/tests/test_pinned_app_server_approval_modes_integration.py +++ b/sdk/python/tests/test_app_server_approvals.py @@ -5,7 +5,7 @@ import asyncio from app_server_harness import AppServerHarness from openai_codex import ApprovalMode, AsyncCodex, Codex from openai_codex.generated.v2_all import AskForApprovalValue, ThreadResumeParams -from pinned_app_server_helpers import response_approval_policy +from app_server_helpers import response_approval_policy def test_thread_resume_inherits_deny_all_approval_mode(tmp_path) -> None: diff --git a/sdk/python/tests/test_pinned_app_server_input_integration.py b/sdk/python/tests/test_app_server_inputs.py similarity index 92% rename from sdk/python/tests/test_pinned_app_server_input_integration.py rename to sdk/python/tests/test_app_server_inputs.py index f5d02cab20..dbd4afd4e0 100644 --- a/sdk/python/tests/test_pinned_app_server_input_integration.py +++ b/sdk/python/tests/test_app_server_inputs.py @@ -2,10 +2,10 @@ from __future__ import annotations from app_server_harness import AppServerHarness from openai_codex import Codex, ImageInput, LocalImageInput, TextInput -from pinned_app_server_helpers import TINY_PNG_BYTES +from app_server_helpers import TINY_PNG_BYTES -def test_remote_image_input_reaches_responses_api_through_pinned_app_server( +def test_remote_image_input_reaches_responses_api( tmp_path, ) -> None: """Remote image inputs should survive the SDK and app-server boundary.""" @@ -38,7 +38,7 @@ def test_remote_image_input_reaches_responses_api_through_pinned_app_server( } -def test_local_image_input_reaches_responses_api_through_pinned_app_server( +def test_local_image_input_reaches_responses_api( tmp_path, ) -> None: """Local image inputs should become data URLs after crossing the app-server.""" diff --git a/sdk/python/tests/test_pinned_app_server_lifecycle_integration.py b/sdk/python/tests/test_app_server_lifecycle.py similarity index 91% rename from sdk/python/tests/test_pinned_app_server_lifecycle_integration.py rename to sdk/python/tests/test_app_server_lifecycle.py index faeae8cfc4..e08462ff65 100644 --- a/sdk/python/tests/test_pinned_app_server_lifecycle_integration.py +++ b/sdk/python/tests/test_app_server_lifecycle.py @@ -2,10 +2,10 @@ from __future__ import annotations from app_server_harness import AppServerHarness from openai_codex import Codex -from pinned_app_server_helpers import request_kind +from app_server_helpers import request_kind -def test_thread_set_name_and_read_use_pinned_app_server(tmp_path) -> None: +def test_thread_set_name_and_read(tmp_path) -> None: """Thread naming should round-trip through app-server JSON-RPC.""" with AppServerHarness(tmp_path) as harness: with Codex(config=harness.app_server_config()) as codex: @@ -18,7 +18,7 @@ def test_thread_set_name_and_read_use_pinned_app_server(tmp_path) -> None: } -def test_thread_fork_returns_distinct_thread_from_pinned_app_server(tmp_path) -> None: +def test_thread_fork_returns_distinct_thread(tmp_path) -> None: """Thread fork should return a distinct thread for a persisted rollout.""" with AppServerHarness(tmp_path) as harness: harness.responses.enqueue_assistant_message("materialized", response_id="fork-seed") @@ -62,7 +62,7 @@ def test_archive_unarchive_round_trip_uses_materialized_rollout(tmp_path) -> Non } -def test_models_use_pinned_app_server_rpc(tmp_path) -> None: +def test_models_rpc(tmp_path) -> None: """Model listing should go through the pinned app-server method.""" with AppServerHarness(tmp_path) as harness: with Codex(config=harness.app_server_config()) as codex: @@ -76,7 +76,7 @@ def test_models_use_pinned_app_server_rpc(tmp_path) -> None: } == {"models_payload_has_data": True} -def test_compact_uses_pinned_app_server_rpc_and_mock_responses(tmp_path) -> None: +def test_compact_rpc_hits_mock_responses(tmp_path) -> None: """Compaction should run through app-server and hit the mock Responses boundary.""" with AppServerHarness(tmp_path) as harness: harness.responses.enqueue_assistant_message("history", response_id="compact-history") diff --git a/sdk/python/tests/test_pinned_app_server_run_integration.py b/sdk/python/tests/test_app_server_run.py similarity index 98% rename from sdk/python/tests/test_pinned_app_server_run_integration.py rename to sdk/python/tests/test_app_server_run.py index 27329764b4..81478d0f7a 100644 --- a/sdk/python/tests/test_pinned_app_server_run_integration.py +++ b/sdk/python/tests/test_app_server_run.py @@ -14,13 +14,13 @@ from app_server_harness import ( ) from openai_codex import AsyncCodex, Codex from openai_codex.generated.v2_all import MessagePhase -from pinned_app_server_helpers import ( +from app_server_helpers import ( agent_message_texts_from_items, assistant_message_with_phase, ) -def test_sync_thread_run_uses_pinned_app_server_and_mock_responses( +def test_sync_thread_run_uses_mock_responses( tmp_path, ) -> None: """Drive Thread.run through the pinned app-server and inspect the HTTP request.""" @@ -51,7 +51,7 @@ def test_sync_thread_run_uses_pinned_app_server_and_mock_responses( } -def test_async_thread_run_uses_pinned_app_server_and_mock_responses( +def test_async_thread_run_uses_mock_responses( tmp_path, ) -> None: """Async Thread.run should exercise the same app-server boundary.""" diff --git a/sdk/python/tests/test_pinned_app_server_stream_integration.py b/sdk/python/tests/test_app_server_streaming.py similarity index 98% rename from sdk/python/tests/test_pinned_app_server_stream_integration.py rename to sdk/python/tests/test_app_server_streaming.py index 3820c25d07..81e2b44d30 100644 --- a/sdk/python/tests/test_pinned_app_server_stream_integration.py +++ b/sdk/python/tests/test_app_server_streaming.py @@ -9,7 +9,7 @@ from openai_codex.generated.v2_all import ( TurnCompletedNotification, TurnStatus, ) -from pinned_app_server_helpers import ( +from app_server_helpers import ( agent_message_texts, next_async_delta, next_sync_delta, @@ -48,7 +48,7 @@ def test_sync_stream_routes_text_deltas_and_completion(tmp_path) -> None: } -def test_turn_run_returns_completed_turn_from_pinned_app_server(tmp_path) -> None: +def test_turn_run_returns_completed_turn(tmp_path) -> None: """TurnHandle.run should wait for the app-server completion notification.""" with AppServerHarness(tmp_path) as harness: harness.responses.enqueue_assistant_message("turn complete", response_id="turn-run-1") diff --git a/sdk/python/tests/test_pinned_app_server_turn_controls_integration.py b/sdk/python/tests/test_app_server_turn_controls.py similarity index 94% rename from sdk/python/tests/test_pinned_app_server_turn_controls_integration.py rename to sdk/python/tests/test_app_server_turn_controls.py index ab3fec8285..40ada74ea3 100644 --- a/sdk/python/tests/test_pinned_app_server_turn_controls_integration.py +++ b/sdk/python/tests/test_app_server_turn_controls.py @@ -3,10 +3,10 @@ from __future__ import annotations from app_server_harness import AppServerHarness from openai_codex import Codex, TextInput from openai_codex.generated.v2_all import TurnStatus -from pinned_app_server_helpers import agent_message_texts, streaming_response +from app_server_helpers import agent_message_texts, streaming_response -def test_turn_steer_adds_follow_up_input_through_pinned_app_server(tmp_path) -> None: +def test_turn_steer_adds_follow_up_input(tmp_path) -> None: """Steering an active turn should create a follow-up Responses request.""" with AppServerHarness(tmp_path) as harness: harness.responses.enqueue_sse(