Author: Adrian Prantl Date: 2019-10-21T20:50:45Z New Revision: ed870cce676ec873d5d0c9e084744ffba0eb67fc
URL: https://github.com/llvm/llvm-project/commit/ed870cce676ec873d5d0c9e084744ffba0eb67fc DIFF: https://github.com/llvm/llvm-project/commit/ed870cce676ec873d5d0c9e084744ffba0eb67fc.diff LOG: Found more timeouts to unify. llvm-svn: 375454 Added: Modified: lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py Removed: ################################################################################ diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py index 54d72907a0e5..ece0cd16393a 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteKill.py +++ b/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. diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py index ed60244e88f1..4effc154d2d7 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemoteThreadsInStopReply.py +++ b/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) diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py index 0944ba5d0510..ffd56e3852bc 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestGdbRemote_qThreadStopInfo.py +++ b/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 _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
