Merge commit '37086cadb1ae' from llvm.org/main into next

Author: git apple-llvm automerger

lldb/test/API/tools/lldb-vscode/launch/TestVSCode_launch.py

@@ -46,12 +46,8 @@ def test_termination(self):
         self.vscode.request_disconnect()
 
         # Wait until the underlying lldb-vscode process dies.
-        # We need to do this because the popen.wait function in python2.7
-        # doesn't have a timeout argument.
-        for _ in range(10):
-            time.sleep(1)
-            if self.vscode.process.poll() is not None:
-                break
+        self.vscode.process.wait(timeout=10)
+
         # Check the return code
         self.assertEqual(self.vscode.process.poll(), 0)