p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3737 from mhall1/ticket_23893 

Fixed #23893: Added tzinfo to constant datetime in unit test
This commit is contained in:
Aymeric Augustin 2014-12-16 13:22:38 +01:00
parent 4efe1b79e9 4fada6f1c9
commit 2cb9d984cf
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -465,6 +465,7 @@ answer newbie questions, and generally made Django that much better:
Maximillian Dornseif <md@hudora.de> Maximillian Dornseif <md@hudora.de>
mccutchen@gmail.com mccutchen@gmail.com
Meir Kriheli <http://mksoft.co.il/> Meir Kriheli <http://mksoft.co.il/>
Michael Hall <mhall1@ualberta.ca>
Michael Josephson <http://www.sdjournal.com/> Michael Josephson <http://www.sdjournal.com/>
Michael Manfre <mmanfre@gmail.com> Michael Manfre <mmanfre@gmail.com>
michael.mcewan@gmail.com michael.mcewan@gmail.com

3
tests/custom_lookups/tests.py
View File

@ -8,6 +8,7 @@ from django.core.exceptions import FieldError
from django.db import models from django.db import models
from django.db import connection from django.db import connection
from django.test import TestCase, override_settings from django.test import TestCase, override_settings
from django.utils import timezone
from .models import Author, MySQLUnixTimestamp from .models import Author, MySQLUnixTimestamp
@ -376,7 +377,7 @@ class DateTimeLookupTests(TestCase):
models.PositiveIntegerField.register_lookup(DateTimeTransform) models.PositiveIntegerField.register_lookup(DateTimeTransform)
try: try:
ut = MySQLUnixTimestamp.objects.create(timestamp=time.time()) ut = MySQLUnixTimestamp.objects.create(timestamp=time.time())
y2k = datetime(2000, 1, 1) y2k = timezone.make_aware(datetime(2000, 1, 1))
self.assertQuerysetEqual( self.assertQuerysetEqual(
MySQLUnixTimestamp.objects.filter(timestamp__as_datetime__gt=y2k), MySQLUnixTimestamp.objects.filter(timestamp__as_datetime__gt=y2k),
[ut], lambda x: x) [ut], lambda x: x)