Better handling of message_queue argument (Fixes #1130)

src/flask_socketio/__init__.py

@@ -197,8 +197,8 @@ def init_app(self, app, **kwargs):
         self.manage_session = self.server_options.pop('manage_session',
                                                       self.manage_session)
 
-        if 'client_manager' not in self.server_options:
-            url = self.server_options.pop('message_queue', None)
+        if 'client_manager' not in kwargs:
+            url = self.server_options.get('message_queue', None)
             channel = self.server_options.pop('channel', 'flask-socketio')
             write_only = app is None
             if url:

test_socketio.py

@@ -345,6 +345,25 @@ def test_disconnect_namespace(self):
         client.disconnect('/test')
         self.assertEqual(disconnected, '/test')
 
+    def test_message_queue_options(self):
+        app = Flask(__name__)
+        socketio = SocketIO(app, message_queue='redis://')
+        self.assertFalse(socketio.server_options['client_manager'].write_only)
+
+        app = Flask(__name__)
+        socketio = SocketIO(app)
+        socketio.init_app(app, message_queue='redis://')
+        self.assertFalse(socketio.server_options['client_manager'].write_only)
+
+        app = Flask(__name__)
+        socketio = SocketIO(message_queue='redis://')
+        self.assertTrue(socketio.server_options['client_manager'].write_only)
+
+        app = Flask(__name__)
+        socketio = SocketIO()
+        socketio.init_app(None, message_queue='redis://')
+        self.assertTrue(socketio.server_options['client_manager'].write_only)
+
     def test_send(self):
         client = socketio.test_client(app, auth={'foo': 'bar'})
         client.get_received()

tox.ini

@@ -18,6 +18,7 @@ commands=
 deps=
     pytest
     pytest-cov
+    redis
 
 [testenv:flake8]
 commands=