diff options
| author | Chris McDonough <chrism@plope.com> | 2010-11-17 01:28:14 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2010-11-17 01:28:14 -0500 |
| commit | e6e0741dbfd90a8d6006bc195bfb5bdf8492ecfe (patch) | |
| tree | 8e5432c82ebd75847df8787cec3fa72438d0ad66 | |
| parent | 991a26169252e498e8e0576fc6d88514624b72d3 (diff) | |
| download | pyramid-e6e0741dbfd90a8d6006bc195bfb5bdf8492ecfe.tar.gz pyramid-e6e0741dbfd90a8d6006bc195bfb5bdf8492ecfe.tar.bz2 pyramid-e6e0741dbfd90a8d6006bc195bfb5bdf8492ecfe.zip | |
make test pass on jython
| -rw-r--r-- | pyramid/tests/test_authentication.py | 2 | ||||
| -rw-r--r-- | pyramid/tests/test_renderers.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pyramid/tests/test_authentication.py b/pyramid/tests/test_authentication.py index 8bae18fba..69762fdb0 100644 --- a/pyramid/tests/test_authentication.py +++ b/pyramid/tests/test_authentication.py @@ -411,7 +411,7 @@ class TestAuthTktCookieHelper(unittest.TestCase): def test_identify_cookie_reissue(self): import time - plugin = self._makeOne('secret', timeout=5, reissue_time=0) + plugin = self._makeOne('secret', timeout=5000, reissue_time=0) plugin.auth_tkt.timestamp = time.time() request = self._makeRequest({'HTTP_COOKIE':'auth_tkt=bogus'}) result = plugin.identify(request) diff --git a/pyramid/tests/test_renderers.py b/pyramid/tests/test_renderers.py index 4c1971d04..102a23f92 100644 --- a/pyramid/tests/test_renderers.py +++ b/pyramid/tests/test_renderers.py @@ -138,6 +138,8 @@ class TestTemplateRendererFactory(unittest.TestCase): result = self._callFUT(info, factory) self.failUnless(result is renderer) path = os.path.abspath(__file__).split('$')[0] # jython + if path.endswith('.pyc'): + path = path[:-1] self.failUnless(factory.path.startswith(path)) self.assertEqual(factory.kw, {}) |