1 |
idella4 14/09/29 03:30:25 |
2 |
|
3 |
Added: flask-0.10.1-sort_json.patch |
4 |
flask-0.10.1-test_appcontext.patch |
5 |
Log: |
6 |
update HOMEPAGE, add patches (from upstream) to fix broken tests (13 months old), update ebuild accordingly |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 dev-python/flask/files/flask-0.10.1-sort_json.patch |
12 |
|
13 |
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 |
14 |
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 |
15 |
|
16 |
Index: flask-0.10.1-sort_json.patch |
17 |
=================================================================== |
18 |
https://github.com/mitsuhiko/flask/commit/a2bc61b5ab19e899735f8945f68123b4cea570d5 |
19 |
diff --git a/flask/testsuite/helpers.py b/flask/testsuite/helpers.py |
20 |
index 636f67f..7de70c0 100644 |
21 |
--- a/flask/testsuite/helpers.py |
22 |
+++ b/flask/testsuite/helpers.py |
23 |
@@ -173,7 +173,33 @@ def index(): |
24 |
c = app.test_client() |
25 |
rv = c.get('/') |
26 |
lines = [x.strip() for x in rv.data.strip().decode('utf-8').splitlines()] |
27 |
- self.assert_equal(lines, [ |
28 |
+ sorted_by_str = [ |
29 |
+ '{', |
30 |
+ '"values": {', |
31 |
+ '"0": "foo",', |
32 |
+ '"1": "foo",', |
33 |
+ '"10": "foo",', |
34 |
+ '"11": "foo",', |
35 |
+ '"12": "foo",', |
36 |
+ '"13": "foo",', |
37 |
+ '"14": "foo",', |
38 |
+ '"15": "foo",', |
39 |
+ '"16": "foo",', |
40 |
+ '"17": "foo",', |
41 |
+ '"18": "foo",', |
42 |
+ '"19": "foo",', |
43 |
+ '"2": "foo",', |
44 |
+ '"3": "foo",', |
45 |
+ '"4": "foo",', |
46 |
+ '"5": "foo",', |
47 |
+ '"6": "foo",', |
48 |
+ '"7": "foo",', |
49 |
+ '"8": "foo",', |
50 |
+ '"9": "foo"', |
51 |
+ '}', |
52 |
+ '}' |
53 |
+ ] |
54 |
+ sorted_by_int = [ |
55 |
'{', |
56 |
'"values": {', |
57 |
'"0": "foo",', |
58 |
@@ -198,8 +224,12 @@ def index(): |
59 |
'"19": "foo"', |
60 |
'}', |
61 |
'}' |
62 |
- ]) |
63 |
+ ] |
64 |
|
65 |
+ try: |
66 |
+ self.assert_equal(lines, sorted_by_int) |
67 |
+ except AssertionError: |
68 |
+ self.assert_equal(lines, sorted_by_str) |
69 |
|
70 |
class SendfileTestCase(FlaskTestCase): |
71 |
|
72 |
|
73 |
|
74 |
|
75 |
1.1 dev-python/flask/files/flask-0.10.1-test_appcontext.patch |
76 |
|
77 |
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 |
78 |
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 |
79 |
|
80 |
Index: flask-0.10.1-test_appcontext.patch |
81 |
=================================================================== |
82 |
https://github.com/mitsuhiko/flask/commit/f88cc2d2f9d14d97e33ddd2bbaa4b1885db06e1c. |
83 |
diff --git a/flask/testsuite/signals.py b/flask/testsuite/signals.py |
84 |
index e061932..45ca45d 100644 |
85 |
--- a/flask/testsuite/signals.py |
86 |
+++ b/flask/testsuite/signals.py |
87 |
@@ -102,7 +102,7 @@ def test_appcontext_signals(self): |
88 |
def record_push(sender, **kwargs): |
89 |
recorded.append('push') |
90 |
def record_pop(sender, **kwargs): |
91 |
- recorded.append('push') |
92 |
+ recorded.append('pop') |
93 |
|
94 |
@app.route('/') |
95 |
def index(): |