From 649dc2e677eaa3c005b125b7b061f2e35372350c Mon Sep 17 00:00:00 2001
From: Tuomo Kriikkula <tuokri@tuta.io>
Date: Mon, 13 Nov 2023 13:17:41 +0200
Subject: [PATCH] Tweaks for running UDK.com

---
 tests/UDKTests/setup_udk_build_env.py | 41 ++++++++++++++-------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/tests/UDKTests/setup_udk_build_env.py b/tests/UDKTests/setup_udk_build_env.py
index 94e83ab..e76a522 100644
--- a/tests/UDKTests/setup_udk_build_env.py
+++ b/tests/UDKTests/setup_udk_build_env.py
@@ -31,7 +31,6 @@
 from typing import IO
 
 import httpx
-import psutil
 import py7zr
 import tqdm
 import watchdog.events
@@ -262,8 +261,9 @@ async def run_udk_build(
         proc = await asyncio.create_subprocess_shell(
             cmd=f'powershell.exe Start-Process -NoNewWindow -FilePath "{udk_exe}" '
                 f'-ArgumentList "make","-useunpublished","-UNATTENDED","LOG=Launch.log",'
-                f'"-VERBOSE","-NOPAUSE","-FORCELOGFLUSH","-DEBUG",'
-                f'"-AUTO"',
+                f'"-NOPAUSE","-FORCELOGFLUSH","-AUTO"',
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.STDOUT,
         )
     else:
         proc = await asyncio.create_subprocess_exec(
@@ -320,8 +320,9 @@ async def run_udk_server(
         test_proc = await asyncio.create_subprocess_shell(
             cmd=f'powershell.exe Start-Process -NoNewWindow -FilePath "{udk_exe}" '
                 f'-ArgumentList "server","{udk_args}","-UNATTENDED","LOG=Launch.log",'
-                f'"-VERBOSE","-NOPAUSE","-FORCELOGFLUSH","-DEBUG",'
-                f'"-AUTO"',
+                f'"-NOPAUSE","-FORCELOGFLUSH","-AUTO"',
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.STDOUT,
         )
     else:
         test_proc = await asyncio.create_subprocess_exec(
@@ -357,15 +358,15 @@ async def run_udk_server(
     return test_ec
 
 
-def print_udk_processes(event: threading.Event):
-    while not event.is_set():
-        sleep_time = 0.01
-        for proc in psutil.process_iter():
-            if "udk" in proc.name().lower():
-                print(f"\t{'#' * 4} {proc}")
-                sleep_time = 0.5
-
-        time.sleep(sleep_time)
+# def print_udk_processes(event: threading.Event):
+#     while not event.is_set():
+#         sleep_time = 0.01
+#         for proc in psutil.process_iter():
+#             if "udk" in proc.name().lower():
+#                 print(f"\t{'#' * 4} {proc}")
+#                 sleep_time = 0.5
+#
+#         time.sleep(sleep_time)
 
 
 async def main():
@@ -527,11 +528,11 @@ async def main():
     testing_event = threading.Event()
     poker_event = threading.Event()
 
-    udk_print_spam_thread = threading.Thread(
-        target=print_udk_processes,
-        args=(poker_event,),
-    )
-    udk_print_spam_thread.start()
+    # udk_print_spam_thread = threading.Thread(
+    #     target=print_udk_processes,
+    #     args=(poker_event,),
+    # )
+    # udk_print_spam_thread.start()
 
     obs = watchdog.observers.Observer()
     watcher = LogWatcher(building_event, testing_event, log_file)
@@ -603,7 +604,7 @@ async def main():
     if ec != 0:
         raise RuntimeError(f"UDK.exe error (sum of all exit codes): {ec}")
 
-    udk_print_spam_thread.join(timeout=5)
+    # udk_print_spam_thread.join(timeout=5)
 
     print(f"finished with {len(watcher.warnings)} warnings")
     print(f"finished with {len(watcher.errors)} errors")