Merge branch 'master' into dan_stateless

1 files changed, 0 insertions, 42 deletions

diff --git a/external_libs/python/zmq/tests/test_stopwatch.py b/external_libs/python/zmq/tests/test_stopwatch.py
deleted file mode 100644
index 49fb79f2..00000000
--- a/external_libs/python/zmq/tests/test_stopwatch.py
+++ /dev/null
@@ -1,42 +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
-
-from zmq import Stopwatch, ZMQError
-
-if sys.version_info[0] >= 3:
-    long = int
-
-class TestStopWatch(TestCase):
-    
-    def test_stop_long(self):
-        """Ensure stop returns a long int."""
-        watch = Stopwatch()
-        watch.start()
-        us = watch.stop()
-        self.assertTrue(isinstance(us, long))
-        
-    def test_stop_microseconds(self):
-        """Test that stop/sleep have right units."""
-        watch = Stopwatch()
-        watch.start()
-        tic = time.time()
-        watch.sleep(1)
-        us = watch.stop()
-        toc = time.time()
-        self.assertAlmostEqual(us/1e6,(toc-tic),places=0)
-    
-    def test_double_stop(self):
-        """Test error raised on multiple calls to stop."""
-        watch = Stopwatch()
-        watch.start()
-        watch.stop()
-        self.assertRaises(ZMQError, watch.stop)
-        self.assertRaises(ZMQError, watch.stop)
-