From c285fc66dbfa68ee5eb9941dbf00e7e0287af916 Mon Sep 17 00:00:00 2001 From: AJ Tuquero Date: Thu, 26 Sep 2019 23:27:45 -0700 Subject: [PATCH] Resolve time import error in exception_handler --- locust/main.py | 2 +- locust/test/test_util.py | 2 +- locust/test/test_zmqrpc.py | 6 ++++++ locust/util/{time.py => timespan.py} | 0 4 files changed, 8 insertions(+), 2 deletions(-) rename locust/util/{time.py => timespan.py} (100%) diff --git a/locust/main.py b/locust/main.py index a42308b485..1cb1594afa 100644 --- 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 index 462c4de95f..0f7aba03a6 100644 --- 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 index 23eab59b8b..9295571f4b 100644 --- a/locust/test/test_zmqrpc.py +++ b/locust/test/test_zmqrpc.py @@ -30,3 +30,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 b/locust/util/timespan.py similarity index 100% rename from locust/util/time.py rename to locust/util/timespan.py