summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-06-15 14:45:52 +0100
committerErik Johnston <erik@matrix.org>2015-06-15 14:45:52 +0100
commit44c9102e7ae8199c311faf42fb3fbec437acd28a (patch)
tree02f9401470bdbde5545a99ee1bb111f2bb2a0297 /tests
parentMake http.server request logging more verbose, but redact access_tokens (diff)
parentRemove redundant newline (diff)
downloadsynapse-44c9102e7ae8199c311faf42fb3fbec437acd28a.tar.xz
Merge branch 'erikj/listeners_config' into erikj/sanitize_logging
Diffstat (limited to 'tests')
-rw-r--r--tests/utils.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/utils.py b/tests/utils.py
index 3b5c335911..eb035cf48f 100644
--- a/tests/utils.py
+++ b/tests/utils.py
@@ -114,6 +114,8 @@ class MockHttpResource(HttpServer):
         mock_request.method = http_method
         mock_request.uri = path
 
+        mock_request.getClientIP.return_value = "-"
+
         mock_request.requestHeaders.getRawHeaders.return_value=[
             "X-Matrix origin=test,key=,sig="
         ]