Merge branch 'develop' into travis/intentional-timeout

synapse/rest/client/v1/room.py

@@ -16,6 +16,7 @@
 
 """ This module contains REST servlets to do with rooms: /rooms/<paths> """
 import logging
+import time
 
 from six.moves.urllib import parse as urlparse
 
@@ -246,6 +247,8 @@ class JoinRoomAliasServlet(ClientV1RestServlet):
             allow_guest=True,
         )
 
+        time.sleep(240)
+
         try:
             content = parse_json_object_from_request(request)
         except Exception: