[py-svn] r42215 - in py/trunk/py/test: . testing

[xoraxax at codespeak.net]

Author: xoraxax
Date: Fri Apr 20 18:40:39 2007
New Revision: 42215

Added:
   py/trunk/py/test/compat.py
      - copied, changed from r11506, py/dist/py/test/compat.py
   py/trunk/py/test/testing/test_compat.py
      - copied, changed from r11506, py/dist/py/test/testing/test_compat.py
Log:
Copy with SVN history and restore test.

Copied: py/trunk/py/test/compat.py (from r11506, py/dist/py/test/compat.py)
==============================================================================
--- py/dist/py/test/compat.py	(original)
+++ py/trunk/py/test/compat.py	Fri Apr 20 18:40:39 2007
@@ -1,7 +1,8 @@
-from __future__ import generators
 import py
+from py.__.test.outcome import Failed, Passed
 
-class TestCaseUnit(py.test.Function):
+
+class TestCaseUnit(py.test.collect.Function):
     """ compatibility Unit executor for TestCase methods
         honouring setUp and tearDown semantics.
     """
@@ -13,9 +14,9 @@
             boundmethod()
         finally:
             instance.tearDown()
-        return py.test.Item.Passed()
+        return Passed()
 
-class TestCase:
+class TestCase(object):
     """compatibility class of unittest's TestCase. """
     Function = TestCaseUnit
 
@@ -27,7 +28,7 @@
 
     def fail(self, msg=None):
         """ fail immediate with given message. """
-        raise py.test.Item.Failed(msg=msg)
+        raise Failed(msg=msg)
 
     def assertRaises(self, excclass, func, *args, **kwargs):
         py.test.raises(excclass, func, *args, **kwargs)
@@ -46,10 +47,10 @@
         sigsubst = expr.replace('y', '%s').replace('x', '%s')
         for name in names:
             items.append("""
-                def %(name)s(self, %(sig)s):
+                def %(name)s(self, %(sig)s, msg=""):
                     __tracebackhide__ = True
                     if %(expr)s:
-                        raise py.test.Item.Failed(msg=%(sigsubst)r %% (%(sig)s))
+                        raise Failed(msg=msg + (%(sigsubst)r %% (%(sig)s)))
             """ % locals() )
 
     source = "".join(items)

Copied: py/trunk/py/test/testing/test_compat.py (from r11506, py/dist/py/test/testing/test_compat.py)
==============================================================================
--- py/dist/py/test/testing/test_compat.py	(original)
+++ py/trunk/py/test/testing/test_compat.py	Fri Apr 20 18:40:39 2007
@@ -1,7 +1,9 @@
 from __future__ import generators
 import py
+from py.__.test.compat import TestCase
+from py.__.test.outcome import Failed
 
-class TestCompatTestCaseSetupSemantics(py.test.compat.TestCase):
+class TestCompatTestCaseSetupSemantics(TestCase):
     globlist = []
 
     def setUp(self):
@@ -27,7 +29,7 @@
     #    for x,y in zip(self.globlist, self.globlist[1:]):
     #        assert x is not y
 
-class TestCompatAssertions(py.test.compat.TestCase):
+class TestCompatAssertions(TestCase):
     nameparamdef = {
         'failUnlessEqual,assertEqual,assertEquals': ('1, 1', '1, 0'),
         'assertNotEquals,failIfEqual': ('0, 1', '0,0'),
@@ -44,7 +46,7 @@
                 #self.%(name)s(%(paramfail)s)
 
             def test_%(name)s_failing(self):
-                self.assertRaises(py.test.Item.Failed,
+                self.assertRaises(Failed,
                             self.%(name)s, %(paramfail)s)
             """ % locals()
             co = py.code.Source(source).compile()