commit a913ea479e92bd2b48c7b50e501669b89c4237df
author Johnny Chen <johnny.chen@apple.com> Tue Oct 19 19:39:20 2010 +0000
committer Johnny Chen <johnny.chen@apple.com> Tue Oct 19 19:39:20 2010 +0000
tree 96b4d212baa4cb154e7abf9d0238b609898b58a0
parent 93910a5a59f3171cecec458b203127862d0cee2b

Add more descriptive messages to expect() instead of using the default assert messages.

llvm-svn: 116850

lldb/test/settings/TestSettings.py

diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py
index dc81e58..e819979 100644
--- a/lldb/test/settings/TestSettings.py
+++ b/lldb/test/settings/TestSettings.py
@@ -23,11 +23,11 @@
         self.runCmd("settings set prompt 'lldb2'")
 
         # Immediately test the setting.
-        self.expect("settings show prompt",
+        self.expect("settings show prompt", SETTING_MSG("prompt"),
             startstr = "prompt (string) = 'lldb2'")
 
         # The overall display should also reflect the new setting.
-        self.expect("settings show",
+        self.expect("settings show", SETTING_MSG("prompt"),
             substrs = ["prompt (string) = 'lldb2'"])
 
         # Use '-r' option to reset to the original default prompt.
@@ -39,11 +39,11 @@
         self.runCmd("settings set term-width 70")
 
         # Immediately test the setting.
-        self.expect("settings show term-width",
+        self.expect("settings show term-width", SETTING_MSG("term-width"),
             startstr = "term-width (int) = '70'")
 
         # The overall display should also reflect the new setting.
-        self.expect("settings show",
+        self.expect("settings show", SETTING_MSG("term-width"),
             substrs = ["term-width (int) = '70'"])
 
     def test_set_auto_confirm(self):
@@ -56,7 +56,7 @@
         self.runCmd("settings set auto-confirm true")
 
         # Immediately test the setting.
-        self.expect("settings show auto-confirm",
+        self.expect("settings show auto-confirm", SETTING_MSG("auto-confirm"),
             startstr = "auto-confirm (boolean) = 'true'")
 
         # Now 'breakpoint delete' should just work fine without confirmation
@@ -67,7 +67,7 @@
 
         # Restore the original setting of auto-confirm.
         self.runCmd("settings set -r auto-confirm")
-        self.expect("settings show auto-confirm",
+        self.expect("settings show auto-confirm", SETTING_MSG("auto-confirm"),
             startstr = "auto-confirm (boolean) = 'false'")
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")