Merge branch 'sockets' into test

jeremyBanks · Apr 29, 2014 · 21e0821 · 21e0821
2 parents 74927e5 + 922530d
commit 21e0821
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/test/test_live_messages.py b/test/test_live_messages.py
@@ -57,12 +57,14 @@ def test_se_message_echo(host_id, room_id):
         seen_message_with_polling = []
 
         def on_socket_message(message, wrapper):
-            if test_message_nonce in message['content']:
+            if (message['event_type'] == 1 and
+                test_message_nonce in message['content']):
                 seen_message_with_socket.append(message)
                 logger.debug("Saw test message in socket")
 
         def on_polling_message(message, wrapper):
-            if test_message_nonce in message['content']:
+            if (message['event_type'] == 1 and
+                test_message_nonce in message['content']):
                 seen_message_with_polling.append(message)
                 logger.debug("Saw test message in polling")