From 7b75761644c7dd65761f2d48acd4579fc9ce628a Mon Sep 17 00:00:00 2001 From: Andrew Godwin Date: Wed, 4 May 2016 18:52:52 -0700 Subject: [PATCH] Flake8 fixes --- channels/tests/test_sessions.py | 18 ++++++++++++++++++ patchinator.py | 3 +++ 2 files changed, 21 insertions(+) diff --git a/channels/tests/test_sessions.py b/channels/tests/test_sessions.py index 22d7d5d..e973f9d 100644 --- a/channels/tests/test_sessions.py +++ b/channels/tests/test_sessions.py @@ -30,10 +30,12 @@ class SessionTests(ChannelTestCase): """ # Construct message to send message = Message({"reply_channel": "test-reply"}, None, None) + # Run through a simple fake consumer that assigns to it @channel_session def inner(message): message.channel_session["num_ponies"] = -1 + inner(message) # Test the session worked session2 = session_for_reply_channel("test-reply") @@ -46,12 +48,14 @@ class SessionTests(ChannelTestCase): """ # Construct message to send message = Message({"reply_channel": "test-reply"}, None, None) + # Run through a simple fake consumer that should trigger the error @channel_session @channel_session def inner(message): message.channel_session["num_ponies"] = -1 inner(message) + # Test the session worked session2 = session_for_reply_channel("test-reply") self.assertEqual(session2["num_ponies"], -1) @@ -62,11 +66,13 @@ class SessionTests(ChannelTestCase): """ # Construct message to send message = Message({}, None, None) + # Run through a simple fake consumer that should trigger the error @channel_session @channel_session def inner(message): message.channel_session["num_ponies"] = -1 + with self.assertRaises(ValueError): inner(message) @@ -87,11 +93,13 @@ class SessionTests(ChannelTestCase): "cookie": ("%s=%s" % (settings.SESSION_COOKIE_NAME, session1.session_key)).encode("ascii"), }, }, None, None) + # Run it through http_session, make sure it works (test double here too) @http_session @http_session def inner(message): message.http_session["species"] = "horse" + inner(message) # Check value assignment stuck session2 = session_for_reply_channel("test-reply") @@ -105,10 +113,12 @@ class SessionTests(ChannelTestCase): message0 = Message({"reply_channel": "test-reply-a", "order": 0}, None, None) message1 = Message({"reply_channel": "test-reply-a", "order": 1}, None, None) message2 = Message({"reply_channel": "test-reply-a", "order": 2}, None, None) + # Run them in an acceptable slight order @enforce_ordering(slight=True) def inner(message): pass + inner(message0) inner(message2) inner(message1) @@ -119,10 +129,12 @@ class SessionTests(ChannelTestCase): """ # Construct messages to send message2 = Message({"reply_channel": "test-reply-e", "order": 2}, None, None) + # Run them in an acceptable strict order @enforce_ordering(slight=True) def inner(message): pass + with self.assertRaises(ConsumeLater): inner(message2) @@ -134,10 +146,12 @@ class SessionTests(ChannelTestCase): message0 = Message({"reply_channel": "test-reply-b", "order": 0}, None, None) message1 = Message({"reply_channel": "test-reply-b", "order": 1}, None, None) message2 = Message({"reply_channel": "test-reply-b", "order": 2}, None, None) + # Run them in an acceptable strict order @enforce_ordering def inner(message): pass + inner(message0) inner(message1) inner(message2) @@ -149,10 +163,12 @@ class SessionTests(ChannelTestCase): # Construct messages to send message0 = Message({"reply_channel": "test-reply-c", "order": 0}, None, None) message2 = Message({"reply_channel": "test-reply-c", "order": 2}, None, None) + # Run them in an acceptable strict order @enforce_ordering def inner(message): pass + inner(message0) with self.assertRaises(ConsumeLater): inner(message2) @@ -162,8 +178,10 @@ class SessionTests(ChannelTestCase): Makes sure messages with no "order" key fail """ message0 = Message({"reply_channel": "test-reply-d"}, None, None) + @enforce_ordering(slight=True) def inner(message): pass + with self.assertRaises(ValueError): inner(message0) diff --git a/patchinator.py b/patchinator.py index 4064013..4cbf44b 100644 --- a/patchinator.py +++ b/patchinator.py @@ -221,6 +221,9 @@ class Patchinator(object): FileMap( "channels/tests/test_request.py", "tests/channels_tests/test_request.py", python_transforms, ), + FileMap( + "channels/tests/test_sessions.py", "tests/channels_tests/test_sessions.py", python_transforms, + ), # Docs FileMap( "docs/backends.rst", "docs/ref/channels/backends.txt", docs_transforms,