[gentoo-commits] gentoo-x86 commit in dev-python/flask/files: flask-0.10.1-sort_json.patch flask-0.10.1-test_appcontext.patch

[gentoo-commits] gentoo-x86 commit in dev-python/flask/files: flask-0.10.1-sort_json.patch flask-0.10.1-test_appcontext.patch

[Ian Delaney (idella4)]

idella4     14/09/29 03:30:25

  Added:                flask-0.10.1-sort_json.patch
                        flask-0.10.1-test_appcontext.patch
  Log:
  update HOMEPAGE, add patches (from upstream) to fix broken tests (13 months old), update ebuild accordingly
  
  (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

Revision  Changes    Path
1.1                  dev-python/flask/files/flask-0.10.1-sort_json.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/flask/files/flask-0.10.1-sort_json.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/flask/files/flask-0.10.1-sort_json.patch?rev=1.1&content-type=text/plain

Index: flask-0.10.1-sort_json.patch
===================================================================
https://github.com/mitsuhiko/flask/commit/a2bc61b5ab19e899735f8945f68123b4cea570d5
diff --git a/flask/testsuite/helpers.py b/flask/testsuite/helpers.py
index 636f67f..7de70c0 100644
--- a/flask/testsuite/helpers.py
+++ b/flask/testsuite/helpers.py
@@ -173,7 +173,33 @@ def index():
         c = app.test_client()
         rv = c.get('/')
         lines = [x.strip() for x in rv.data.strip().decode('utf-8').splitlines()]
-        self.assert_equal(lines, [
+        sorted_by_str = [
+            '{',
+            '"values": {',
+            '"0": "foo",',
+            '"1": "foo",',
+            '"10": "foo",',
+            '"11": "foo",',
+            '"12": "foo",',
+            '"13": "foo",',
+            '"14": "foo",',
+            '"15": "foo",',
+            '"16": "foo",',
+            '"17": "foo",',
+            '"18": "foo",',
+            '"19": "foo",',
+            '"2": "foo",',
+            '"3": "foo",',
+            '"4": "foo",',
+            '"5": "foo",',
+            '"6": "foo",',
+            '"7": "foo",',
+            '"8": "foo",',
+            '"9": "foo"',
+            '}',
+            '}'
+        ]
+        sorted_by_int = [
             '{',
             '"values": {',
             '"0": "foo",',
@@ -198,8 +224,12 @@ def index():
             '"19": "foo"',
             '}',
             '}'
-        ])
+        ]
 
+        try:
+            self.assert_equal(lines, sorted_by_int)
+        except AssertionError:
+            self.assert_equal(lines, sorted_by_str)
 
 class SendfileTestCase(FlaskTestCase):




1.1                  dev-python/flask/files/flask-0.10.1-test_appcontext.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/flask/files/flask-0.10.1-test_appcontext.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/flask/files/flask-0.10.1-test_appcontext.patch?rev=1.1&content-type=text/plain

Index: flask-0.10.1-test_appcontext.patch
===================================================================
https://github.com/mitsuhiko/flask/commit/f88cc2d2f9d14d97e33ddd2bbaa4b1885db06e1c.
diff --git a/flask/testsuite/signals.py b/flask/testsuite/signals.py
index e061932..45ca45d 100644
--- a/flask/testsuite/signals.py
+++ b/flask/testsuite/signals.py
@@ -102,7 +102,7 @@ def test_appcontext_signals(self):
         def record_push(sender, **kwargs):
             recorded.append('push')
         def record_pop(sender, **kwargs):
-            recorded.append('push')
+            recorded.append('pop')
 
         @app.route('/')
         def index():