summaryrefslogtreecommitdiff
path: root/test/test_cache.py
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-03-02 14:00:45 -0500
committersqla-tester <sqla-tester@sqlalchemy.org>2020-03-02 14:00:45 -0500
commit6a13e22e7131fd6792dae4cb5b3ab97dcae4a4cd (patch)
tree6d4f0049a22d522d92b65e9a15c49e77eae9c680 /test/test_cache.py
parentf619c28764e21f2569772d808d6294f435823d9f (diff)
downloadmako-6a13e22e7131fd6792dae4cb5b3ab97dcae4a4cd.tar.gz
Use unittest.SkipTest (again?)
While I can believe that the standard exception might not have worked with some ancient version of pytest, it certainly works just fine now. This saves people from importing nose which kills pytest via DeprecationWarnings these days. Closes: #316 Pull-request: https://github.com/sqlalchemy/mako/pull/316 Pull-request-sha: 90dfcfc3d0351ab9bf8125e8c2adb45c57059a6d Change-Id: Ie816acd325c6783e08801bc83de37dbe6b4581e5
Diffstat (limited to 'test/test_cache.py')
-rw-r--r--test/test_cache.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/test/test_cache.py b/test/test_cache.py
index 7fe9350..d662872 100644
--- a/test/test_cache.py
+++ b/test/test_cache.py
@@ -1,4 +1,5 @@
import time
+import unittest
from mako import lookup
from mako.cache import CacheImpl
@@ -9,7 +10,6 @@ from mako.lookup import TemplateLookup
from mako.template import Template
from test import eq_
from test import module_base
-from test import SkipTest
from test import TemplateTest
from test.util import result_lines
@@ -649,9 +649,9 @@ class BeakerCacheTest(RealBackendTest, CacheTest):
def setUp(self):
if not beaker_cache.has_beaker:
- raise SkipTest("Beaker is required for these tests.")
+ raise unittest.SkipTest("Beaker is required for these tests.")
if not py27:
- raise SkipTest("newer beakers not working w/ py26")
+ raise unittest.SkipTest("newer beakers not working w/ py26")
def _install_mock_cache(self, template, implname=None):
template.cache_args["manager"] = self._regions()
@@ -676,7 +676,9 @@ class DogpileCacheTest(RealBackendTest, CacheTest):
try:
import dogpile.cache # noqa
except ImportError:
- raise SkipTest("dogpile.cache is required to run these tests")
+ raise unittest.SkipTest(
+ "dogpile.cache is required to run these tests"
+ )
def _install_mock_cache(self, template, implname=None):
template.cache_args["regions"] = self._regions()