Modified the remaining test cases to display more meaningful assert messages.
Added a generic message generator to the lldbtest.py base module.
llvm-svn: 110625
diff --git a/lldb/test/help/TestHelp.py b/lldb/test/help/TestHelp.py
index 91aa8b9..e0782d6 100644
--- a/lldb/test/help/TestHelp.py
+++ b/lldb/test/help/TestHelp.py
@@ -7,9 +7,9 @@
import os, time
import unittest2
import lldb
-import lldbtest
+from lldbtest import *
-class TestHelpCommand(lldbtest.TestBase):
+class TestHelpCommand(TestBase):
mydir = "help"
@@ -17,22 +17,24 @@
"""A simple test of 'help' command and its output."""
res = lldb.SBCommandReturnObject()
self.ci.HandleCommand("help", res)
- time.sleep(0.1)
+ #time.sleep(0.1)
self.assertTrue(res.Succeeded())
self.assertTrue(res.GetOutput().startswith(
- 'The following is a list of built-in, permanent debugger commands'))
+ 'The following is a list of built-in, permanent debugger commands'),
+ CMD_MSG('help'))
def test_help_should_not_hang_emacsshell(self):
"""Command 'set term-width 0' should not hang the help command."""
res = lldb.SBCommandReturnObject()
self.ci.HandleCommand("set term-width 0", res)
- time.sleep(0.1)
- self.assertTrue(res.Succeeded())
+ #time.sleep(0.1)
+ self.assertTrue(res.Succeeded(), CMD_MSG('set term-width 0'))
self.ci.HandleCommand("help", res)
- time.sleep(0.1)
+ #time.sleep(0.1)
self.assertTrue(res.Succeeded())
self.assertTrue(res.GetOutput().startswith(
- 'The following is a list of built-in, permanent debugger commands'))
+ 'The following is a list of built-in, permanent debugger commands'),
+ CMD_MSG('help'))
if __name__ == '__main__':