Improve the structure of CI (#911)

test/lang/run_suite.py

@@ -1,50 +1,17 @@
 import argparse
 import glob
-import multiprocessing
-import os
-import time
-import unittest
 
-from sglang.utils import run_with_timeout
+from sglang.test.test_utils import run_unittest_files
 
 suites = {
-    "minimal": ["test_openai_backend.py", "test_srt_backend.py"],
+    "minimal": ["test_srt_backend.py", "test_openai_backend.py"],
 }
 
 
-def run_unittest_files(files, args):
-    for filename in files:
-
-        def func():
-            print(filename)
-            ret = unittest.main(module=None, argv=["", "-vb"] + [filename])
-
-        p = multiprocessing.Process(target=func)
-
-        def run_one_file():
-            p.start()
-            p.join()
-
-        try:
-            run_with_timeout(run_one_file, timeout=args.time_limit_per_file)
-            if p.exitcode != 0:
-                return False
-        except TimeoutError:
-            p.terminate()
-            time.sleep(5)
-            print(
-                f"\nTimeout after {args.time_limit_per_file} seconds "
-                f"when running {filename}"
-            )
-            return False
-
-    return True
-
-
 if __name__ == "__main__":
     arg_parser = argparse.ArgumentParser()
     arg_parser.add_argument(
-        "--time-limit-per-file",
+        "--timeout-per-file",
         type=int,
         default=1000,
         help="The time limit for running one file in seconds.",
@@ -63,12 +30,5 @@ if __name__ == "__main__":
     else:
         files = suites[args.suite]
 
-    tic = time.time()
-    success = run_unittest_files(files, args)
-
-    if success:
-        print(f"Success. Time elapsed: {time.time() - tic:.2f}s")
-    else:
-        print(f"Fail. Time elapsed: {time.time() - tic:.2f}s")
-
-    exit(0 if success else -1)
+    exit_code = run_unittest_files(files, args.timeout_per_file)
+    exit(exit_code)