Found more timeouts to unify.

git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@375454 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 7 insertions, 5 deletions

diff --git a/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py b/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
index 54d72907a..ece0cd163 100644
--- a/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
+++ b/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py
@@ -32,7 +32,7 @@ class TestGdbRemoteKill(gdbremote_testcase.GdbRemoteTestCaseBase):
 
         # 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.
diff --git a/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py b/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
index ed60244e8..4effc154d 100644
--- a/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
+++ b/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py
@@ -43,7 +43,7 @@ class TestGdbRemoteThreadsInStopReply(
         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 @@ class TestGdbRemoteThreadsInStopReply(
         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)
 
diff --git a/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py b/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
index 0944ba5d0..ffd56e385 100644
--- a/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
+++ b/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py
@@ -34,7 +34,7 @@ class TestGdbRemote_qThreadStopInfo(gdbremote_testcase.GdbRemoteTestCaseBase):
         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 @@ class TestGdbRemote_qThreadStopInfo(gdbremote_testcase.GdbRemoteTestCaseBase):
         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