The expected term-width output string should be put within a list, not as a list of characters.
Also uncomment the cleanup of "stdout.txt" file as part of the class cleanup routine even though
test_set_output_path() is failing right now.

llvm-svn: 116023
diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py
index f4c58f3..51c0259 100644
--- a/lldb/test/settings/TestSettings.py
+++ b/lldb/test/settings/TestSettings.py
@@ -13,8 +13,8 @@
 
     @classmethod
     def classCleanup(cls):
-        system(["/bin/sh", "-c", "rm output.txt"])
-        #system(["/bin/sh", "-c", "rm stdout.txt"])
+        system(["/bin/sh", "-c", "rm -f output.txt"])
+        system(["/bin/sh", "-c", "rm -f stdout.txt"])
 
     def test_set_prompt(self):
         """Test that 'set prompt' actually changes the prompt."""
@@ -45,7 +45,7 @@
 
         # The overall display should also reflect the new setting.
         self.expect("settings show",
-            substrs = "term-width (int) = '70'")
+            substrs = ["term-width (int) = '70'"])
 
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym(self):