From f88cc2d2f9d14d97e33ddd2bbaa4b1885db06e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Neuha=CC=88user?= <dasdasich@gmail.com>
Date: Thu, 27 Jun 2013 16:49:27 +0200
Subject: [PATCH] Fix broken test_appcontext_signals test case

This fixes #781 and ensures that Flask is tested with blinker installed.
---
 .travis-devel-requirements.txt   | 3 +++
 .travis-lowest-requirements.txt  | 3 +++
 .travis-release-requirements.txt | 2 ++
 CHANGES                          | 7 +++++++
 flask/testsuite/signals.py       | 2 +-
 tox.ini                          | 1 +
 6 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.travis-devel-requirements.txt b/.travis-devel-requirements.txt
index afdc2649..c8bd9c45 100644
--- a/.travis-devel-requirements.txt
+++ b/.travis-devel-requirements.txt
@@ -1,3 +1,6 @@
 git+git://github.com/mitsuhiko/werkzeug.git#egg=Werkzeug
 git+git://github.com/mitsuhiko/jinja2.git#egg=Jinja2
 git+git://github.com/mitsuhiko/itsdangerous.git#egg=itsdangerous
+
+# extra dependencies
+hg+http://bitbucket.org/jek/blinker#egg=blinker
diff --git a/.travis-lowest-requirements.txt b/.travis-lowest-requirements.txt
index 54498262..5066d698 100644
--- a/.travis-lowest-requirements.txt
+++ b/.travis-lowest-requirements.txt
@@ -1,3 +1,6 @@
 Werkzeug==0.7
 Jinja2==2.4
 itsdangerous==0.21
+
+# extra dependencies
+blinker==1.0
diff --git a/.travis-release-requirements.txt b/.travis-release-requirements.txt
index e69de29b..f2f097cb 100644
--- a/.travis-release-requirements.txt
+++ b/.travis-release-requirements.txt
@@ -0,0 +1,2 @@
+# extra dependencies
+blinker
diff --git a/CHANGES b/CHANGES
index fb0a511b..89ef41d7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,13 @@ Flask Changelog
 
 Here you can see the full list of changes between each Flask release.
 
+Version 0.10.2
+--------------
+
+(bugfix release, release date to be announced)
+
+- Fixed broken `test_appcontext_signals()` test case.
+
 Version 0.10.1
 --------------
 
diff --git a/flask/testsuite/signals.py b/flask/testsuite/signals.py
index e061932d..45ca45d9 100644
--- a/flask/testsuite/signals.py
+++ b/flask/testsuite/signals.py
@@ -102,7 +102,7 @@ class SignalsTestCase(FlaskTestCase):
         def record_push(sender, **kwargs):
             recorded.append('push')
         def record_pop(sender, **kwargs):
-            recorded.append('push')
+            recorded.append('pop')
 
         @app.route('/')
         def index():
diff --git a/tox.ini b/tox.ini
index a8782e00..711762fb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,4 +3,5 @@ envlist = py26, py27, pypy, py33
 
 [testenv]
 deps = -egit+git://github.com/mitsuhiko/werkzeug.git#egg=werkzeug
+       blinker
 commands = python run-tests.py []