don't give up if we can't create default avatars during tests

This commit is contained in:
Matthew Hodgson 2015-02-07 21:24:08 +00:00
parent adc4310a73
commit 37b6b880ef

View File

@ -103,15 +103,18 @@ class RegistrationHandler(BaseHandler):
# XXX: ideally clients would explicitly specify one, but given they don't # XXX: ideally clients would explicitly specify one, but given they don't
# and we want consistent and pretty identicons for random users, we'll # and we want consistent and pretty identicons for random users, we'll
# do it here. # do it here.
auth_user = UserID.from_string(user_id) try:
identicon_resource = self.hs.get_resource_for_media_repository().getChildWithDefault("identicon", None) auth_user = UserID.from_string(user_id)
upload_resource = self.hs.get_resource_for_media_repository().getChildWithDefault("upload", None) identicon_resource = self.hs.get_resource_for_media_repository().getChildWithDefault("identicon", None)
identicon_bytes = identicon_resource.generate_identicon(user_id, 320, 320) upload_resource = self.hs.get_resource_for_media_repository().getChildWithDefault("upload", None)
content_uri = yield upload_resource.create_content( identicon_bytes = identicon_resource.generate_identicon(user_id, 320, 320)
"image/png", None, identicon_bytes, len(identicon_bytes), auth_user content_uri = yield upload_resource.create_content(
) "image/png", None, identicon_bytes, len(identicon_bytes), auth_user
profile_handler = self.hs.get_handlers().profile_handler )
profile_handler.set_avatar_url(auth_user, auth_user, ("%s#auto" % content_uri)) profile_handler = self.hs.get_handlers().profile_handler
profile_handler.set_avatar_url(auth_user, auth_user, ("%s#auto" % content_uri))
except NotImplementedError:
pass # make tests pass without messing around creating default avatars
defer.returnValue((user_id, token)) defer.returnValue((user_id, token))