summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpjenvey <pjenvey@localhost>2009-05-07 06:34:01 +0000
committerpjenvey <pjenvey@localhost>2009-05-07 06:34:01 +0000
commitbeb10ff91899d3974bcfcbd862466f1e76393abf (patch)
tree6d9adf115affa1c161140b5dfb6c74801d61734d
parent9c16ee0bf2ac1934c8a3134c603f5c5658b49962 (diff)
downloadpastedeploy-git-beb10ff91899d3974bcfcbd862466f1e76393abf.tar.gz
convert to nose 0.11
-rw-r--r--setup.py2
-rw-r--r--tests/__init__.py (renamed from tests/conftest.py)0
-rw-r--r--tests/test_config_middleware.py4
3 files changed, 4 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index d561a1a..e2516f6 100644
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,8 @@ For the latest changes see the `news file
packages=find_packages(exclude='tests'),
include_package_data=True,
zip_safe=False,
+ test_suite='nose.collector',
+ tests_require=['nose>=0.11'],
extras_require={
'Config': [],
'Paste': ['Paste'],
diff --git a/tests/conftest.py b/tests/__init__.py
index 0ba8f8a..0ba8f8a 100644
--- a/tests/conftest.py
+++ b/tests/__init__.py
diff --git a/tests/test_config_middleware.py b/tests/test_config_middleware.py
index 0443dca..868e75f 100644
--- a/tests/test_config_middleware.py
+++ b/tests/test_config_middleware.py
@@ -1,6 +1,6 @@
+from nose.tools import assert_raises
from paste.deploy.config import ConfigMiddleware
from paste.fixture import TestApp
-from py.test import raises
class Bug(Exception): pass
@@ -14,5 +14,5 @@ def app_with_exception(environ, start_response):
def test_error():
wrapped = ConfigMiddleware(app_with_exception, {'test': 1})
test_app = TestApp(wrapped)
- raises(Bug, "test_app.get('/')")
+ assert_raises(Bug, test_app.get, '/')