Merge pull request #1095 from ajt89/time-import-fix

Resolve time import error in exception_handler
locustio · Oct 1, 2019 · d5d28e6 · d5d28e6
2 parents c95dda3 + c285fc6
commit d5d28e6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/locust/main.py b/locust/main.py
@@ -19,7 +19,7 @@
 from .runners import LocalLocustRunner, MasterLocustRunner, SlaveLocustRunner
 from .stats import (print_error_report, print_percentile_stats, print_stats,
                     stats_printer, stats_writer, write_stat_csvs)
-from .util.time import parse_timespan
+from .util.timespan import parse_timespan
 
 _internals = [Locust, HttpLocust]
 version = locust.__version__

diff --git a/locust/test/test_util.py b/locust/test/test_util.py
@@ -1,5 +1,5 @@
 import unittest
-from locust.util.time import parse_timespan
+from locust.util.timespan import parse_timespan
 from locust.util.rounding import proper_round
 
 

diff --git a/locust/test/test_zmqrpc.py b/locust/test/test_zmqrpc.py
@@ -36,3 +36,9 @@ def test_client_recv(self):
         self.assertEqual(msg.type, 'test')
         self.assertEqual(msg.data, 'message')
         self.assertEqual(msg.node_id, 'identity')
+
+    def test_client_retry(self):
+        server = zmqrpc.Server('0.0.0.0', 8888)
+        server.socket.close()
+        with self.assertRaises(zmq.error.ZMQError):
+            server.recv_from_client()
diff --git a/locust/util/time.py → locust/util/timespan.py b/locust/util/time.py → locust/util/timespan.py