From e8ccc58254aa7fcc68a7ff0dc321de1fdd96cb3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20Gro=C3=9F?= Date: Tue, 29 Jan 2013 13:30:37 +0100 Subject: [PATCH] fix testcase for django < 1.4 --- rest_framework/tests/serializer.py | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py index 7afd3f698..fb34443e0 100644 --- a/rest_framework/tests/serializer.py +++ b/rest_framework/tests/serializer.py @@ -1,6 +1,8 @@ import datetime import pickle +import django from django.test import TestCase +from django.utils import unittest from rest_framework import serializers from rest_framework.tests.models import (HasPositiveIntegerAsChoice, Album, ActionItem, Anchor, BasicModel, BlankFieldModel, BlogPost, Book, CallableDefaultValueModel, DefaultValueModel, @@ -514,8 +516,6 @@ class DateValidationTest(TestCase): class DateTimeValidationTest(TestCase): def test_valid_date_time_input_formats(self): - serializer = DateTimeObjectSerializer(data={'date_time': '1984-07-31 04:31:59.123456'}) - self.assertTrue(serializer.is_valid()) serializer = DateTimeObjectSerializer(data={'date_time': '1984-07-31 04:31:59'}) self.assertTrue(serializer.is_valid()) @@ -526,9 +526,6 @@ class DateTimeValidationTest(TestCase): serializer = DateTimeObjectSerializer(data={'date_time': '1984-07-31'}) self.assertTrue(serializer.is_valid()) - serializer = DateTimeObjectSerializer(data={'date_time': '07/31/1984 04:31:59.123456'}) - self.assertTrue(serializer.is_valid()) - serializer = DateTimeObjectSerializer(data={'date_time': '07/31/1984 04:31:59'}) self.assertTrue(serializer.is_valid()) @@ -538,9 +535,6 @@ class DateTimeValidationTest(TestCase): serializer = DateTimeObjectSerializer(data={'date_time': '07/31/1984'}) self.assertTrue(serializer.is_valid()) - serializer = DateTimeObjectSerializer(data={'date_time': '07/31/84 04:31:59.123456'}) - self.assertTrue(serializer.is_valid()) - serializer = DateTimeObjectSerializer(data={'date_time': '07/31/84 04:31:59'}) self.assertTrue(serializer.is_valid()) @@ -550,6 +544,18 @@ class DateTimeValidationTest(TestCase): serializer = DateTimeObjectSerializer(data={'date_time': '07/31/84'}) self.assertTrue(serializer.is_valid()) + @unittest.skipUnless(django.VERSION >= (1, 4), "django < 1.4 don't have microseconds in default settings") + def test_valid_date_time_input_formats_2(self): + serializer = DateTimeObjectSerializer(data={'date_time': '1984-07-31 04:31:59.123456'}) + self.assertTrue(serializer.is_valid()) + + serializer = DateTimeObjectSerializer(data={'date_time': '07/31/1984 04:31:59.123456'}) + self.assertTrue(serializer.is_valid()) + + serializer = DateTimeObjectSerializer(data={'date_time': '07/31/84 04:31:59.123456'}) + self.assertTrue(serializer.is_valid()) + + def test_wrong_date_time_input_format(self): serializer = DateTimeObjectSerializer(data={'date_time': 'something wrong'}) self.assertFalse(serializer.is_valid())