Merge commit '8c214bbdd9a3' from apple/master into swift/master-next

Author: git apple-llvm automerger

lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py

@@ -32,7 +32,7 @@ def attach_commandline_kill_after_initial_stop(self):
 
         # Wait a moment for completed and now-detached inferior process to
         # clear.
-        time.sleep(1)
+        time.sleep(self._WAIT_TIMEOUT)
 
         if not lldb.remote_platform:
             # Process should be dead now. Reap results.

lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py

@@ -43,7 +43,7 @@ def gather_stop_reply_fields(self, post_startup_log_lines, thread_count,
         hw_info = self.parse_hw_info(context)
 
         # Give threads time to start up, then break.
-        time.sleep(1)
+        time.sleep(self._WAIT_TIMEOUT)
         self.reset_test_sequence()
         self.test_sequence.add_log_lines(
             [
@@ -61,7 +61,8 @@ def gather_stop_reply_fields(self, post_startup_log_lines, thread_count,
         self.assertIsNotNone(context)
 
         # Wait until all threads have started.
-        threads = self.wait_for_thread_count(thread_count, timeout_seconds=3)
+        threads = self.wait_for_thread_count(thread_count,
+                                             timeout_seconds=self._WAIT_TIMEOUT)
         self.assertIsNotNone(threads)
         self.assertEqual(len(threads), thread_count)
 

lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py

@@ -34,7 +34,7 @@ def gather_stop_replies_via_qThreadStopInfo(self, thread_count):
         self.assertIsNotNone(context)
 
         # Give threads time to start up, then break.
-        time.sleep(1)
+        time.sleep(self._WAIT_TIMEOUT)
         self.reset_test_sequence()
         self.test_sequence.add_log_lines(
             [
@@ -52,7 +52,8 @@ def gather_stop_replies_via_qThreadStopInfo(self, thread_count):
         self.assertIsNotNone(context)
 
         # Wait until all threads have started.
-        threads = self.wait_for_thread_count(thread_count, timeout_seconds=self._WAIT_TIMEOUT)
+        threads = self.wait_for_thread_count(thread_count,
+                                             timeout_seconds=self._WAIT_TIMEOUT)
         self.assertIsNotNone(threads)
 
         # On Windows, there could be more threads spawned. For example, DebugBreakProcess will