From d75d83defdbcc2e498f816b5cd20dcc24a1b7138 Mon Sep 17 00:00:00 2001
From: "Eugene M. Kim" <eugene.kim@ntti3.com>
Date: Wed, 14 Jun 2017 11:30:42 -0700
Subject: [PATCH] Add UTs for #2372

test_encode_aware_datetime() fails for non-UTC timezones due to the bug.
---
 tests/test_helpers.py | 10 ++++++++++
 tox.ini               |  1 +
 2 files changed, 11 insertions(+)

diff --git a/tests/test_helpers.py b/tests/test_helpers.py
index c66e650b68..9e6797466f 100644
--- a/tests/test_helpers.py
+++ b/tests/test_helpers.py
@@ -23,6 +23,7 @@
 from werkzeug.http import http_date
 from flask._compat import StringIO, text_type
 from flask.helpers import get_debug_flag, make_response
+from pytz import timezone
 
 
 def has_encoding(name):
@@ -177,6 +178,15 @@ def test_jsonify_date_types(self, app, client):
             assert rv.mimetype == 'application/json'
             assert flask.json.loads(rv.data)['x'] == http_date(d.timetuple())
 
+    @pytest.mark.parametrize('tzname', ('UTC', 'PST8PDT', 'Asia/Seoul'))
+    def test_jsonify_aware_datetimes(self, tzname):
+        """Test if aware datetime.datetime objects are converted into GMT."""
+        dt_naive = datetime.datetime(2017, 1, 1, 12, 34, 56)
+        dt_aware = timezone(tzname).localize(dt_naive)
+        dt_as_gmt = dt_aware.astimezone(timezone('GMT'))
+        expected = dt_as_gmt.strftime('"%a, %d %b %Y %H:%M:%S %Z"')
+        assert flask.json.JSONEncoder().encode(dt_aware) == expected
+
     def test_jsonify_uuid_types(self, app, client):
         """Test jsonify with uuid.UUID types"""
 
diff --git a/tox.ini b/tox.ini
index cb6dd342a3..a0b4ad6609 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,6 +15,7 @@ deps =
     coverage
     greenlet
     blinker
+    pytz
 
     lowest: Werkzeug==0.9
     lowest: Jinja2==2.4