summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorOscar Ramirez <tuxskar@gmail.com>2014-12-17 00:30:26 +0100
committerTim Graham <timograham@gmail.com>2014-12-22 07:26:57 -0500
commit1ad5deedd4c51729be680e3c2730c2ef5ab4f831 (patch)
tree5cce4908603db1ed1c9e5794dfef947f8e4caf85 /tests
parentc24624025bf7fe741a882e79b892055688245cc2 (diff)
[1.7.x] Fixed #23998 -- Added datetime.time support to migrations questioner.
Backport of 54085b0f9ba7d9f705f9b9c90d3433b0ef6aa042 from master
Diffstat (limited to 'tests')
-rw-r--r--tests/migrations/test_writer.py4
-rw-r--r--tests/utils_tests/test_datetime_safe.py9
2 files changed, 11 insertions, 2 deletions
diff --git a/tests/migrations/test_writer.py b/tests/migrations/test_writer.py
index dc551acc6b..7abddd1248 100644
--- a/tests/migrations/test_writer.py
+++ b/tests/migrations/test_writer.py
@@ -112,6 +112,10 @@ class WriterTests(TestCase):
string, imports = MigrationWriter.serialize(safe_date)
self.assertEqual(string, repr(datetime.date(2014, 3, 31)))
self.assertEqual(imports, {'import datetime'})
+ safe_time = datetime_safe.time(10, 25)
+ string, imports = MigrationWriter.serialize(safe_time)
+ self.assertEqual(string, repr(datetime.time(10, 25)))
+ self.assertEqual(imports, {'import datetime'})
safe_datetime = datetime_safe.datetime(2014, 3, 31, 16, 4, 31)
string, imports = MigrationWriter.serialize(safe_datetime)
self.assertEqual(string, repr(datetime.datetime(2014, 3, 31, 16, 4, 31)))
diff --git a/tests/utils_tests/test_datetime_safe.py b/tests/utils_tests/test_datetime_safe.py
index 3a8d31d6d8..655a7350d5 100644
--- a/tests/utils_tests/test_datetime_safe.py
+++ b/tests/utils_tests/test_datetime_safe.py
@@ -1,7 +1,7 @@
import unittest
-from datetime import date as original_date, datetime as original_datetime
-from django.utils.datetime_safe import date, datetime
+from datetime import date as original_date, datetime as original_datetime, time as original_time
+from django.utils.datetime_safe import date, datetime, time
class DatetimeTests(unittest.TestCase):
@@ -9,6 +9,7 @@ class DatetimeTests(unittest.TestCase):
def setUp(self):
self.just_safe = (1900, 1, 1)
self.just_unsafe = (1899, 12, 31, 23, 59, 59)
+ self.just_time = (11, 30, 59)
self.really_old = (20, 1, 1)
self.more_recent = (2006, 1, 1)
@@ -21,6 +22,8 @@ class DatetimeTests(unittest.TestCase):
self.assertEqual(original_date(*self.just_safe).strftime('%Y-%m-%d'), date(*self.just_safe).strftime('%Y-%m-%d'))
self.assertEqual(original_datetime(*self.just_safe).strftime('%Y-%m-%d'), datetime(*self.just_safe).strftime('%Y-%m-%d'))
+ self.assertEqual(original_time(*self.just_time).strftime('%H:%M:%S'), time(*self.just_time).strftime('%H:%M:%S'))
+
def test_safe_strftime(self):
self.assertEqual(date(*self.just_unsafe[:3]).strftime('%Y-%m-%d (weekday %w)'), '1899-12-31 (weekday 0)')
self.assertEqual(date(*self.just_safe).strftime('%Y-%m-%d (weekday %w)'), '1900-01-01 (weekday 1)')
@@ -28,6 +31,8 @@ class DatetimeTests(unittest.TestCase):
self.assertEqual(datetime(*self.just_unsafe).strftime('%Y-%m-%d %H:%M:%S (weekday %w)'), '1899-12-31 23:59:59 (weekday 0)')
self.assertEqual(datetime(*self.just_safe).strftime('%Y-%m-%d %H:%M:%S (weekday %w)'), '1900-01-01 00:00:00 (weekday 1)')
+ self.assertEqual(time(*self.just_time).strftime('%H:%M:%S AM'), '11:30:59 AM')
+
# %y will error before this date
self.assertEqual(date(*self.just_safe).strftime('%y'), '00')
self.assertEqual(datetime(*self.just_safe).strftime('%y'), '00')