backport fixes for 32-bit platforms from master (datetime tests)

Chris McDonough

2011-11-22 bf72c55183f39f364884e1479301b6aa85fa5327

backport fixes for 32-bit platforms from master (datetime tests)

 pyramid/tests/test_integration.py

@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-

import datetime
import os
import unittest

@@ -8,6 +9,9 @@
from pyramid.static import static_view

from zope.interface import Interface

# 5 years from now (more or less)
fiveyrsfuture = datetime.datetime.utcnow() + datetime.timedelta(5*365)

class INothing(Interface):
    pass
@@ -93,7 +97,7 @@

    def test_not_modified(self):
        self.testapp.extra_environ = {
            'HTTP_IF_MODIFIED_SINCE':httpdate(pow(2, 32)-1)}
            'HTTP_IF_MODIFIED_SINCE':httpdate(fiveyrsfuture)}
        res = self.testapp.get('/minimal.pt', status=304)
        self.assertEqual(res.body, '')

@@ -585,6 +589,4 @@
        return application(None, None)

def httpdate(ts):
    import datetime
    ts = datetime.datetime.utcfromtimestamp(ts)
    return ts.strftime("%a, %d %b %Y %H:%M:%S GMT")

 pyramid/tests/test_static.py

@@ -1,4 +1,8 @@
import datetime
import unittest

# 5 years from now (more or less)
fiveyrsfuture = datetime.datetime.utcnow() + datetime.timedelta(5*365)

class Test_static_view_use_subpath_False(unittest.TestCase):
    def _getTargetClass(self):
@@ -138,7 +142,7 @@
    def test_resource_notmodified(self):
        inst = self._makeOne('pyramid.tests:fixtures/static')
        request = self._makeRequest({'PATH_INFO':'/index.html'})
        request.if_modified_since = pow(2, 32) -1
        request.if_modified_since = fiveyrsfuture
        context = DummyContext()
        response = inst(context, request)
        start_response = DummyStartResponse()
@@ -300,7 +304,7 @@
    def test_resource_notmodified(self):
        inst = self._makeOne('pyramid.tests:fixtures/static')
        request = self._makeRequest()
        request.if_modified_since = pow(2, 32) -1
        request.if_modified_since = fiveyrsfuture
        request.subpath = ('index.html',)
        context = DummyContext()
        response = inst(context, request)