Author: pjenvey
Date: 2008-03-04 18:39:13 -0700 (Tue, 04 Mar 2008)
New Revision: 3297
Added:
FormEncode/trunk/tests/__init__.py
Removed:
FormEncode/trunk/tests/conftest.py
Modified:
FormEncode/trunk/setup.cfg
FormEncode/trunk/setup.py
FormEncode/trunk/tests/test_context.py
FormEncode/trunk/tests/test_schema.py
Log:
o use nose as the preferred test runner, with setup.py test support
o only require elementtree if < 2.5
Modified: FormEncode/trunk/setup.cfg
===================================================================
--- FormEncode/trunk/setup.cfg 2008-03-05 01:37:52 UTC (rev 3296)
+++ FormEncode/trunk/setup.cfg 2008-03-05 01:39:13 UTC (rev 3297)
@@ -41,3 +41,6 @@
[aliases]
distribute = register sdist bdist_egg upload pudge publish
+
+[nosetests]
+detailed-errors = 1
Modified: FormEncode/trunk/setup.py
===================================================================
--- FormEncode/trunk/setup.py 2008-03-05 01:37:52 UTC (rev 3296)
+++ FormEncode/trunk/setup.py 2008-03-05 01:39:13 UTC (rev 3297)
@@ -1,3 +1,4 @@
+import sys
try:
from setuptools import setup
except ImportError:
@@ -7,6 +8,10 @@
version = '0.9.1'
+tests_require = ['nose']
+if sys.version < '2.5':
+ tests_require.append('elementtree')
+
setup(name="FormEncode",
version=version,
description="HTML form validation, generation, and conversion package",
@@ -31,7 +36,8 @@
license="PSF",
packages=["formencode", "formencode.util"],
include_package_data=True,
- extras_require={'testing': ['elementtree']},
+ test_suite='nose.collector',
+ tests_require=tests_require
)
# Send announce to:
Copied: FormEncode/trunk/tests/__init__.py (from rev 3295,
FormEncode/trunk/tests/conftest.py)
===================================================================
--- FormEncode/trunk/tests/__init__.py (rev 0)
+++ FormEncode/trunk/tests/__init__.py 2008-03-05 01:39:13 UTC (rev 3297)
@@ -0,0 +1,4 @@
+import sys, os
+sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+import pkg_resources
+pkg_resources.require('FormEncode')
Deleted: FormEncode/trunk/tests/conftest.py
===================================================================
--- FormEncode/trunk/tests/conftest.py 2008-03-05 01:37:52 UTC (rev 3296)
+++ FormEncode/trunk/tests/conftest.py 2008-03-05 01:39:13 UTC (rev 3297)
@@ -1,7 +0,0 @@
-import sys, os
-sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
-import pkg_resources
-try:
- import elementtree
-except ImportError:
- pkg_resources.require('FormEncode[testing]')
Modified: FormEncode/trunk/tests/test_context.py
===================================================================
--- FormEncode/trunk/tests/test_context.py 2008-03-05 01:37:52 UTC (rev
3296)
+++ FormEncode/trunk/tests/test_context.py 2008-03-05 01:39:13 UTC (rev
3297)
@@ -1,5 +1,5 @@
from formencode.context import Context, ContextRestoreError
-from py.test import raises
+from nose.tools import assert_raises
c1 = Context(default=None)
c2 = Context()
@@ -29,7 +29,7 @@
c3 = Context()
res1 = c3.set(a=1)
res2 = c3.set(b=2)
- raises(ContextRestoreError, 'res1.restore()')
+ assert_raises(ContextRestoreError, res1.restore)
assert c3.b==2
assert c3.a==1
res2.restore()
Modified: FormEncode/trunk/tests/test_schema.py
===================================================================
--- FormEncode/trunk/tests/test_schema.py 2008-03-05 01:37:52 UTC (rev
3296)
+++ FormEncode/trunk/tests/test_schema.py 2008-03-05 01:39:13 UTC (rev
3297)
@@ -134,7 +134,7 @@
def test_this():
for case in all_cases:
- yield case.test
+ yield (case.test,)
def test_merge():
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
FormEncode-CVS mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/formencode-cvs
