Fixed bug introduced by #451 causing request stats endpoint to break …

…when there were any failures.

Fixes #481

locust/stats.py

@@ -366,15 +366,15 @@ def __init__(self, method, name, error, occurences=0):
 
     @classmethod
     def parse_error(cls, error):
-        string_error = str(error)
+        string_error = repr(error)
         target = "object at 0x"
         target_index = string_error.find(target)
         if target_index < 0:
-            return error
+            return string_error
         start = target_index + len(target) - 2
         end = string_error.find(">", start)
         if end < 0:
-            return error
+            return string_error
         hex_address = string_error[start:end]
         return string_error.replace(hex_address, "0x....")
 

locust/test/test_web.py

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 import csv
 import json
 import sys
@@ -23,6 +25,8 @@ def setUp(self):
         options = parser.parse_args([])[0]
         runners.locust_runner = LocustRunner([], options)
 
+        web.request_stats.clear_cache()
+
         self._web_ui_server = wsgi.WSGIServer(('127.0.0.1', 0), web.app, log=None)
         gevent.spawn(lambda: self._web_ui_server.serve_forever())
         gevent.sleep(0.01)
@@ -76,6 +80,11 @@ def test_distribution_stats_csv(self):
         response = requests.get("http://127.0.0.1:%i/stats/distribution/csv" % self.web_port)
         self.assertEqual(200, response.status_code)
 
+    def test_request_stats_with_errors(self):
+        stats.global_stats.get("/", "GET").log_error(Exception("Error1337"))
+        response = requests.get("http://127.0.0.1:%i/stats/requests" % self.web_port)
+        self.assertEqual(200, response.status_code)
+
     def test_exceptions(self):
         try:
             raise Exception(u"A cool test exception")