o Added unittest2 which has added the new features in unittest for Python 2.7

  backported to Python 2.3+.  Some of the features desired include better
  verbose reporting in unittest2.TextTestRunner and decorator support for
  skipping tests and expected failures.

  http://pypi.python.org/pypi/unittest2

o Modified the existing .py tests to use unittest2 and decorated
  TestSTL.test_step_into_stl(), which is known to always fail currently, with
  @unittest2.expectedFailure.

llvm-svn: 110397

Author: Johnny Chen

lldb/test/array_types/TestArrayTypes.py

@@ -1,7 +1,7 @@
 """Test breakpoint by file/line number; and list variables with array types."""
 
 import os, time
-import unittest
+import unittest2
 import lldb
 import lldbtest
 
@@ -74,4 +74,4 @@ def test_array_types(self):
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest.main()
+    unittest2.main()

lldb/test/class_types/TestClassTypes.py

@@ -1,7 +1,7 @@
 """Test breakpoint on a class constructor; and variable list the this object."""
 
 import os, time
-import unittest
+import unittest2
 import lldb
 import lldbtest
 
@@ -51,4 +51,4 @@ def test_class_types(self):
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest.main()
+    unittest2.main()

lldb/test/command_source/TestCommandSource.py

@@ -5,7 +5,7 @@
 """
 
 import os, time
-import unittest
+import unittest2
 import lldb
 import lldbtest
 
@@ -33,4 +33,4 @@ def test_command_source(self):
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest.main()
+    unittest2.main()

lldb/test/dead-strip/TestDeadStrip.py

@@ -3,7 +3,7 @@
 """
 
 import os, time
-import unittest
+import unittest2
 import lldb
 import lldbtest
 
@@ -82,4 +82,4 @@ def test_dead_strip(self):
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest.main()
+    unittest2.main()

lldb/test/dotest.py

@@ -17,14 +17,14 @@
 import os
 import sys
 import time
-import unittest
+import unittest2
 
 #
 # Global variables:
 #
 
 # The test suite.
-suite = unittest.TestSuite()
+suite = unittest2.TestSuite()
 
 # Default verbosity is 0.
 verbose = 0
@@ -122,7 +122,7 @@ def visit(prefix, dir, names):
             if not sys.path.count(dir):
                 sys.path.append(dir)
             base = os.path.splitext(name)[0]
-            suite.addTests(unittest.defaultTestLoader.loadTestsFromName(base))
+            suite.addTests(unittest2.defaultTestLoader.loadTestsFromName(base))
 
 
 #
@@ -155,7 +155,7 @@ def visit(prefix, dir, names):
     if not res.Succeeded():
         raise Exception('log enable failed (check your LLDB_LOG env variable...')
 
-unittest.TextTestRunner(verbosity=verbose).run(suite)
+unittest2.TextTestRunner(verbosity=verbose).run(suite)
 
 # Add some delay before calling SBDebugger.Terminate().
 time.sleep(1)

lldb/test/function_types/TestFunctionTypes.py

@@ -1,7 +1,7 @@
 """Test variable with function ptr type and that break on the function works."""
 
 import os, time
-import unittest
+import unittest2
 import lldb
 import lldbtest
 
@@ -67,4 +67,4 @@ def test_function_types(self):
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest.main()
+    unittest2.main()

lldb/test/global_variables/TestGlobalVariables.py

@@ -1,7 +1,7 @@
 """Show global variables and check that they do indeed have global scopes."""
 
 import os, time
-import unittest
+import unittest2
 import lldb
 import lldbtest
 
@@ -57,4 +57,4 @@ def test_global_variables(self):
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest.main()
+    unittest2.main()

lldb/test/help/TestHelp.py

@@ -5,7 +5,7 @@
 """
 
 import os, time
-import unittest
+import unittest2
 import lldb
 import lldbtest
 
@@ -39,4 +39,4 @@ def test_help_should_not_hang_emacsshell(self):
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest.main()
+    unittest2.main()

lldb/test/lldbtest.py

@@ -28,11 +28,11 @@
 """
 
 import os
-import unittest
+import unittest2
 import lldb
 import traceback
 
-class TestBase(unittest.TestCase):
+class TestBase(unittest2.TestCase):
     """This LLDB abstract base class is meant to be subclassed."""
 
     # The concrete subclass should override this attribute.

lldb/test/load_unload/TestLoadUnload.py

@@ -3,7 +3,7 @@
 """
 
 import os, time
-import unittest
+import unittest2
 import lldb
 import lldbtest
 
@@ -70,4 +70,4 @@ def test_load_unload(self):
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest.main()
+    unittest2.main()

lldb/test/order/TestOrderFile.py

@@ -4,7 +4,7 @@
 
 import os, time
 import re
-import unittest
+import unittest2
 import lldb
 import lldbtest
 
@@ -37,4 +37,4 @@ def test_order_file(self):
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest.main()
+    unittest2.main()

lldb/test/set_values/TestSetValues.py

@@ -1,7 +1,7 @@
 """Test settings and readings of program variables."""
 
 import os, time
-import unittest
+import unittest2
 import lldb
 import lldbtest
 
@@ -115,4 +115,4 @@ def test_set_values(self):
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest.main()
+    unittest2.main()

lldb/test/stl/TestSTL.py

@@ -3,14 +3,15 @@
 """
 
 import os, time
-import unittest
+import unittest2
 import lldb
 import lldbtest
 
 class TestSTL(lldbtest.TestBase):
 
     mydir = "stl"
 
+    @unittest2.expectedFailure
     def test_step_into_stl(self):
         """Test that we can successfully step into an STL function."""
         res = self.res
@@ -75,4 +76,4 @@ def test_step_into_stl(self):
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest.main()
+    unittest2.main()

lldb/test/struct_types/TestStructTypes.py

@@ -5,7 +5,7 @@
 """
 
 import os, time
-import unittest
+import unittest2
 import lldb
 import lldbtest
 
@@ -52,4 +52,4 @@ def test_struct_types(self):
     import atexit
     lldb.SBDebugger.Initialize()
     atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest.main()
+    unittest2.main()

lldb/test/unittest2/__init__.py

@@ -0,0 +1,68 @@
+"""
+unittest2
+
+unittest2 is a backport of the new features added to the unittest testing
+framework in Python 2.7. It is tested to run on Python 2.4 - 2.6.
+
+To use unittest2 instead of unittest simply replace ``import unittest`` with
+``import unittest2``.
+
+
+Copyright (c) 1999-2003 Steve Purcell
+Copyright (c) 2003-2010 Python Software Foundation
+This module is free software, and you may redistribute it and/or modify
+it under the same terms as Python itself, so long as this copyright message
+and disclaimer are retained in their original form.
+
+IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT,
+SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF
+THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
+
+THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+PARTICULAR PURPOSE.  THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,
+AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
+SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
+"""
+
+__all__ = ['TestResult', 'TestCase', 'TestSuite',
+           'TextTestRunner', 'TestLoader', 'FunctionTestCase', 'main',
+           'defaultTestLoader', 'SkipTest', 'skip', 'skipIf', 'skipUnless',
+           'expectedFailure', 'TextTestResult', '__version__', 'collector']
+
+__version__ = '0.5.1'
+
+# Expose obsolete functions for backwards compatibility
+__all__.extend(['getTestCaseNames', 'makeSuite', 'findTestCases'])
+
+
+from unittest2.collector import collector
+from unittest2.result import TestResult
+from unittest2.case import (
+    TestCase, FunctionTestCase, SkipTest, skip, skipIf,
+    skipUnless, expectedFailure
+)
+from unittest2.suite import BaseTestSuite, TestSuite
+from unittest2.loader import (
+    TestLoader, defaultTestLoader, makeSuite, getTestCaseNames,
+    findTestCases
+)
+from unittest2.main import TestProgram, main, main_
+from unittest2.runner import TextTestRunner, TextTestResult
+
+try:
+    from unittest2.signals import (
+        installHandler, registerResult, removeResult, removeHandler
+    )
+except ImportError:
+    # Compatibility with platforms that don't have the signal module
+    pass
+else:
+    __all__.extend(['installHandler', 'registerResult', 'removeResult', 
+                    'removeHandler'])
+
+# deprecated
+_TextTestResult = TextTestResult
+
+__unittest = True

lldb/test/unittest2/__main__.py

@@ -0,0 +1,10 @@
+"""Main entry point"""
+
+import sys
+if sys.argv[0].endswith("__main__.py"):
+    sys.argv[0] = "unittest2"
+
+__unittest = True
+
+from unittest2.main import main_
+main_()