Skip to content

Commit

Permalink
[lldb-dap] Fix test_exit_status_message_sigterm test. (#90223)
Browse files Browse the repository at this point in the history
Summary:
'test_exit_status_message_sigterm' is failing due to 'psutil' dependency
introduced in PR #89405. This fix removes 'deque' dependency and checks
if 'psutil' can be imported before running the test. If 'psutil' cannot
be imported, it emits a warning and skips the test.

Test Plan:
./bin/llvm-lit -sv
/path-to-llvm-project/lldb/test/API/tools/lldb-dap/console/TestDAP_console.py
--filter=tools/lldb-dap/console/TestDAP_console.py

Reviewers:
@jeffreytan81,@clayborg,@kusmour, @JDevlieghere,@walter-erquinigo

Subscribers:

Tasks:
lldb-dap

Tags:
  • Loading branch information
mbucko committed May 3, 2024
1 parent 4821882 commit bab1098
Showing 1 changed file with 14 additions and 6 deletions.
20 changes: 14 additions & 6 deletions lldb/test/API/tools/lldb-dap/console/TestDAP_console.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@

import dap_server
import lldbdap_testcase
import psutil
from collections import deque
from lldbsuite.test import lldbutil
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *


def get_subprocess(process_name):
queue = deque([psutil.Process(os.getpid())])
def get_subprocess(root_process, process_name):
queue = [root_process]
while queue:
process = queue.popleft()
process = queue.pop()
if process.name() == process_name:
return process
queue.extend(process.children())
Expand Down Expand Up @@ -131,7 +129,17 @@ def test_exit_status_message_sigterm(self):
process_name = (
"debugserver" if platform.system() in ["Darwin"] else "lldb-server"
)
process = get_subprocess(process_name)

try:
import psutil
except ImportError:
print(
"psutil not installed, please install using 'pip install psutil'. "
"Skipping test_exit_status_message_sigterm test.",
file=sys.stderr,
)
return
process = get_subprocess(psutil.Process(os.getpid()), process_name)
process.terminate()
process.wait()

Expand Down

0 comments on commit bab1098

Please sign in to comment.