| commit | 2908fcac09bbedbf055de09b3bff6a9d84194d5e | [log] [tgz] |
|---|---|---|
| author | Mike Bayer <mike_mp@zzzcomputing.com> | Sun Jul 26 11:15:33 2015 -0400 |
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | Sun Jul 26 11:15:33 2015 -0400 |
| tree | 43f01ba17bd872f9038de832cf27deb92a5623d0 | |
| parent | 33f1aed63cf5cf27d190862d5e7ac6b06200ee47 [diff] |
- use a SkipTest pytest can find
diff --git a/test/__init__.py b/test/__init__.py index 666318f..22d1c83 100644 --- a/test/__init__.py +++ b/test/__init__.py
@@ -8,9 +8,11 @@ from mako.cache import CacheImpl, register_plugin try: + # unitttest has a SkipTest also but pytest doesn't + # honor it unless nose is imported too... from nose import SkipTest except ImportError: - from unittest import SkipTest + from _pytest.runner import Skipped as SkipTest import contextlib