diff options
| author | Chris McDonough <chrism@plope.com> | 2011-10-06 05:50:52 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-10-06 05:50:52 -0400 |
| commit | 1475676963d24559aaf4dda88ec303a2f76d2479 (patch) | |
| tree | acd064a9a410a0f3df4455795eb1c60b42b46f0c | |
| parent | 795f29785e45cbb035c29583ad7a626931d2d59e (diff) | |
| download | pyramid-1475676963d24559aaf4dda88ec303a2f76d2479.tar.gz pyramid-1475676963d24559aaf4dda88ec303a2f76d2479.tar.bz2 pyramid-1475676963d24559aaf4dda88ec303a2f76d2479.zip | |
make all tests pass; coverage
| -rw-r--r-- | pyramid/tests/test_integration.py | 3 | ||||
| -rw-r--r-- | pyramid/tests/test_request.py | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/pyramid/tests/test_integration.py b/pyramid/tests/test_integration.py index 2210f8fff..86cd73910 100644 --- a/pyramid/tests/test_integration.py +++ b/pyramid/tests/test_integration.py @@ -577,9 +577,6 @@ class DummyRequest: return application(None, None) def httpdate(ts): - import datetime - if isinstance(ts, int): - ts = datetime.datetime.utcfromtimestamp(ts) return ts.strftime("%a, %d %b %Y %H:%M:%S GMT") def read_(filename): diff --git a/pyramid/tests/test_request.py b/pyramid/tests/test_request.py index 5a11acd07..9d498e12f 100644 --- a/pyramid/tests/test_request.py +++ b/pyramid/tests/test_request.py @@ -85,10 +85,9 @@ class TestRequest(unittest.TestCase): self.assertEqual(inst.__dict__['session'], 'orangejuice') def test_session_not_configured(self): - from pyramid.exceptions import ConfigurationError inst = self._makeOne({}) inst.registry = self.config.registry - self.assertRaises(ConfigurationError, getattr, inst, 'session') + self.assertRaises(AttributeError, getattr, inst, 'session') def test_setattr_and_getattr_dotnotation(self): inst = self._makeOne({}) |