From 5c27fdf7774ec205afedbb0bc22782c889f75add Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Wed, 9 Mar 2016 18:08:58 -0500 Subject: - disable some beaker tests that fail for 2.6 --- mako/compat.py | 1 + test/test_cache.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mako/compat.py b/mako/compat.py index db22b99..a2ab243 100644 --- a/mako/compat.py +++ b/mako/compat.py @@ -5,6 +5,7 @@ py3k = sys.version_info >= (3, 0) py33 = sys.version_info >= (3, 3) py2k = sys.version_info < (3,) py26 = sys.version_info >= (2, 6) +py27 = sys.version_info >= (2, 7) jython = sys.platform.startswith('java') win32 = sys.platform.startswith('win') pypy = hasattr(sys, 'pypy_version_info') diff --git a/test/test_cache.py b/test/test_cache.py index f37042f..990a088 100644 --- a/test/test_cache.py +++ b/test/test_cache.py @@ -5,7 +5,7 @@ import time from test.util import result_lines from test import TemplateTest, module_base from test import eq_, SkipTest - +from mako.compat import py27 from mako.ext import beaker_cache @@ -603,6 +603,8 @@ class BeakerCacheTest(RealBackendTest, CacheTest): def setUp(self): if not beaker_cache.has_beaker: raise SkipTest("Beaker is required for these tests.") + if not py27: + raise SkipTest("newer beakers not working w/ py26") def _install_mock_cache(self, template, implname=None): template.cache_args['manager'] = self._regions() -- cgit v1.2.1