Merge branch 'master' into dan_stateless

1 files changed, 0 insertions, 34 deletions

diff --git a/external_libs/python/zmq/tests/test_zmqstream.py b/external_libs/python/zmq/tests/test_zmqstream.py
deleted file mode 100644
index cdb3a171..00000000
--- a/external_libs/python/zmq/tests/test_zmqstream.py
+++ /dev/null
@@ -1,34 +0,0 @@
-# -*- coding: utf8 -*-
-# Copyright (C) PyZMQ Developers
-# Distributed under the terms of the Modified BSD License.
-
-
-import sys
-import time
-
-from unittest import TestCase
-
-import zmq
-from zmq.eventloop import ioloop, zmqstream
-
-class TestZMQStream(TestCase):
-    
-    def setUp(self):
-        self.context = zmq.Context()
-        self.socket = self.context.socket(zmq.REP)
-        self.loop = ioloop.IOLoop.instance()
-        self.stream = zmqstream.ZMQStream(self.socket)
-    
-    def tearDown(self):
-        self.socket.close()
-        self.context.term()
-    
-    def test_callable_check(self):
-        """Ensure callable check works (py3k)."""
-        
-        self.stream.on_send(lambda *args: None)
-        self.stream.on_recv(lambda *args: None)
-        self.assertRaises(AssertionError, self.stream.on_recv, 1)
-        self.assertRaises(AssertionError, self.stream.on_send, 1)
-        self.assertRaises(AssertionError, self.stream.on_recv, zmq)
-