diff options
| author | Aron Ahmadia <aron@ahmadia.net> | 2012-07-17 16:59:50 -0500 |
|---|---|---|
| committer | Aron Ahmadia <aron@ahmadia.net> | 2012-07-17 16:59:50 -0500 |
| commit | a419a3036aa8202d00eb6e857c79d66adc56bed0 (patch) | |
| tree | 4a73e6fff2ee13b35c154c43bd7b58bb6c2af633 /numpy/testing | |
| parent | 7316499dd60baa7bb260875b79f7d22be491c986 (diff) | |
| parent | 6c772fab57934d24b66638ea5001eb02d1662f5e (diff) | |
| download | numpy-a419a3036aa8202d00eb6e857c79d66adc56bed0.tar.gz | |
Merge branch 'master' of https://github.com/numpy/numpy into patch-2
Diffstat (limited to 'numpy/testing')
| -rw-r--r-- | numpy/testing/decorators.py | 2 | ||||
| -rw-r--r-- | numpy/testing/nosetester.py | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/numpy/testing/decorators.py b/numpy/testing/decorators.py index a7cc9a847..053b99211 100644 --- a/numpy/testing/decorators.py +++ b/numpy/testing/decorators.py @@ -210,7 +210,7 @@ def knownfailureif(fail_condition, msg=None): from noseclasses import KnownFailureTest def knownfailer(*args, **kwargs): if fail_val(): - raise KnownFailureTest, msg + raise KnownFailureTest(msg) else: return f(*args, **kwargs) return nose.tools.make_decorator(f)(knownfailer) diff --git a/numpy/testing/nosetester.py b/numpy/testing/nosetester.py index a776faa43..60fec35d6 100644 --- a/numpy/testing/nosetester.py +++ b/numpy/testing/nosetester.py @@ -119,11 +119,12 @@ class NoseTester(object): Notes ----- - The default for `raise_warnings` is ``(DeprecationWarning, RuntimeWarning)`` - for the master branch of NumPy, and ``()`` for maintenance branches and - released versions. The purpose of this switching behavior is to catch as - many warnings as possible during development, but not give problems for - packaging of released versions. + The default for `raise_warnings` is + ``(DeprecationWarning, RuntimeWarning)`` for the master branch of NumPy, + and ``()`` for maintenance branches and released versions. The purpose + of this switching behavior is to catch as many warnings as possible + during development, but not give problems for packaging of released + versions. """ # Stuff to exclude from tests. These are from numpy.distutils |