diff options
| author | Callum Prentice <callum@gmail.com> | 2016-12-06 08:23:05 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2016-12-06 08:23:05 -0800 |
| commit | be04be34557355652ad2318904335eafed30add9 (patch) | |
| tree | 2457d5cc709fa2e905ae0d0aa11f635db6601917 /indra/llcorehttp/tests | |
| parent | 3c16beedc0d41834f22527aa916bd6c609786587 (diff) | |
| parent | e6b9174bba29b6fcbb611280f7bfd06c40d3193e (diff) | |
Automated merge with tip of lindenlab/viewer64
Diffstat (limited to 'indra/llcorehttp/tests')
| -rwxr-xr-x | indra/llcorehttp/tests/test_llcorehttp_peer.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/llcorehttp/tests/test_llcorehttp_peer.py b/indra/llcorehttp/tests/test_llcorehttp_peer.py index 3ec9cd7d4c..cc636d8d87 100755 --- a/indra/llcorehttp/tests/test_llcorehttp_peer.py +++ b/indra/llcorehttp/tests/test_llcorehttp_peer.py @@ -284,7 +284,8 @@ class Server(ThreadingMixIn, HTTPServer): # to stderr which annoys some. Disable this override to get # default behavior which *shouldn't* cause the program to return # a failure status. - def handle_error(self, request, client_address): + if not VERBOSE: + def handle_error(self, request, client_address): print '-'*40 print 'Ignoring exception during processing of request from', print client_address |