move dagster dev tests to core

dagster-io · Feb 10, 2025 · d3c450d · d3c450d
1 parent b0402ca
commit d3c450d
Show file tree

Hide file tree

Showing 12 changed files with 387 additions and 318 deletions.
diff --git a/...tests/test_suites/daemon-test-suite/dagster_dev_command_tests/test_dagster_dev_command.py b/...tests/test_suites/daemon-test-suite/dagster_dev_command_tests/test_dagster_dev_command.py
diff --git a/integration_tests/test_suites/daemon-test-suite/dagster_dev_command_tests/workspace.yaml b/integration_tests/test_suites/daemon-test-suite/dagster_dev_command_tests/workspace.yaml
diff --git a/python_modules/dagster/dagster/_grpc/server.py b/python_modules/dagster/dagster/_grpc/server.py
@@ -4,6 +4,7 @@
 import multiprocessing
 import os
 import queue
+import subprocess
 import sys
 import threading
 import time
@@ -109,6 +110,8 @@
     from multiprocessing.synchronize import Event as MPEvent
     from subprocess import Popen
 
+    from dagster._grpc.client import DagsterGrpcClient
+
 EVENT_QUEUE_POLL_INTERVAL = 0.1
 
 CLEANUP_TICK = 0.5
@@ -1328,12 +1331,12 @@ def __init__(self, port=None, socket=None):
 
 
 def wait_for_grpc_server(
-    server_process,
-    client,
-    subprocess_args,
-    timeout=60,
+    server_process: subprocess.Popen,
+    client: "DagsterGrpcClient",
+    subprocess_args: Sequence[str],
+    timeout: int = 60,
     additional_timeout_msg: Optional[str] = None,
-):
+) -> None:
     start_time = time.time()
 
     last_error = None

diff --git a/python_modules/dagster/dagster/_serdes/ipc.py b/python_modules/dagster/dagster/_serdes/ipc.py
@@ -211,6 +211,14 @@ def interrupt_ipc_subprocess(proc: "Popen[Any]") -> None:
         proc.send_signal(signal.SIGINT)
 
 
+def interrupt_or_kill_ipc_subprocess(proc: "Popen[Any]", wait_time: int = 10) -> None:
+    interrupt_ipc_subprocess(proc)
+    try:
+        proc.wait(timeout=wait_time)
+    except subprocess.TimeoutExpired:
+        proc.kill()
+
+
 def interrupt_ipc_subprocess_pid(pid: int) -> None:
     """Send CTRL_BREAK_EVENT on Windows, SIGINT on other platforms."""
     check.int_param(pid, "pid")

diff --git a/...ite/dagster_dev_command_tests/__init__.py → ...sts/dagster_dev_command_tests/__init__.py b/...ite/dagster_dev_command_tests/__init__.py → ...sts/dagster_dev_command_tests/__init__.py
diff --git a/...st-suite/dagster_dev_command_tests/bar.py → ...nd_tests/dagster_dev_command_tests/bar.py b/...st-suite/dagster_dev_command_tests/bar.py → ...nd_tests/dagster_dev_command_tests/bar.py
diff --git a/...t-suite/dagster_dev_command_tests/repo.py → ...d_tests/dagster_dev_command_tests/repo.py b/...t-suite/dagster_dev_command_tests/repo.py → ...d_tests/dagster_dev_command_tests/repo.py
@@ -1,6 +1,6 @@
 import os
 
-from bar import foo_op  # requires working_directory
+from bar import foo_op  # requires working_directory  # type: ignore
 from dagster import DefaultSensorStatus, RunRequest, job, repository, sensor