diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2016-12-06 16:07:05 -0500 | 
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2016-12-06 16:07:05 -0500 | 
| commit | 4aae3e8eb4e6872b62e15b721ee7f6c34b80d3c8 (patch) | |
| tree | e9268526b06cf53a30b0cc91668ee894a8700dd2 | |
| parent | 199d3c5675b4acd00e50b0fb0a2ebe01985e668d (diff) | |
DRTVWR-418: Try harder to ignore errors in llcorehttp's dummy server.
| -rwxr-xr-x | indra/llcorehttp/tests/test_llcorehttp_peer.py | 14 | 
1 files changed, 10 insertions, 4 deletions
| diff --git a/indra/llcorehttp/tests/test_llcorehttp_peer.py b/indra/llcorehttp/tests/test_llcorehttp_peer.py index caa204b519..b91cd6bcb4 100755 --- a/indra/llcorehttp/tests/test_llcorehttp_peer.py +++ b/indra/llcorehttp/tests/test_llcorehttp_peer.py @@ -284,10 +284,16 @@ class Server(HTTPServer):      # default behavior which *shouldn't* cause the program to return      # a failure status.      def handle_error(self, request, client_address): -        print '-'*40 -        print 'Ignoring exception during processing of request from', -        print client_address -        print '-'*40 +        print >>sys.stderr, '-'*40 +        print >>sys.stderr, 'Ignoring exception during processing of request from', client_address +        print >>sys.stderr, '-'*40 + +    def shutdown_request(self, *args, **kwds): +        try: +            # just forward to base-class method, but wrap in try/except +            HTTPServer.shutdown_request(*args, **kwds) +        except Exception as err: +            print >>sys.stderr, "Once more ignoring: %s" % err  if __name__ == "__main__":      do_valgrind = False | 
