summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-10-19 19:52:55 -0400
committerTim Graham <timograham@gmail.com>2015-10-19 20:27:36 -0400
commit994e7661a8b682ecd2bce4869d5a6cc61ee8c2c9 (patch)
tree7f154e3ac28c19c4c72d5273e634c4f85c0c5acc
parent522b0bc91f6eddfcc8b8cc0f3d3566983f5bdfc2 (diff)
[1.9.x] Fixed #25562 -- Skipped a time dependent admin_filters test on Windows.
Backport of 4a50daf6b343db1b5c316aa29efd657e160d0cd3 from master
-rw-r--r--tests/admin_filters/tests.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/admin_filters/tests.py b/tests/admin_filters/tests.py
index f17928e4b1..8363a44192 100644
--- a/tests/admin_filters/tests.py
+++ b/tests/admin_filters/tests.py
@@ -1,6 +1,8 @@
from __future__ import unicode_literals
import datetime
+import sys
+import unittest
from django.contrib.admin import (
AllValuesFieldListFilter, BooleanFieldListFilter, ModelAdmin,
@@ -381,6 +383,11 @@ class ListFiltersTests(TestCase):
)
)
+ @unittest.skipIf(
+ sys.platform.startswith('win'),
+ "Windows doesn't support setting a timezone that differs from the "
+ "system timezone."
+ )
@override_settings(USE_TZ=True)
def test_datefieldlistfilter_with_time_zone_support(self):
# Regression for #17830