mirror of
https://github.com/element-hq/synapse.git
synced 2024-12-18 17:10:43 +03:00
fix conflict and reinstate 6372dff771
This commit is contained in:
parent
c7503f8f33
commit
9498cd3e7b
1 changed files with 0 additions and 4 deletions
|
@ -34,8 +34,6 @@ class ProfileStoreTestCase(unittest.TestCase):
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def test_displayname(self):
|
def test_displayname(self):
|
||||||
yield self.store.create_profile(self.u_frank.localpart)
|
|
||||||
|
|
||||||
yield self.store.set_profile_displayname(
|
yield self.store.set_profile_displayname(
|
||||||
self.u_frank.localpart, "Frank", 1,
|
self.u_frank.localpart, "Frank", 1,
|
||||||
)
|
)
|
||||||
|
@ -47,8 +45,6 @@ class ProfileStoreTestCase(unittest.TestCase):
|
||||||
|
|
||||||
@defer.inlineCallbacks
|
@defer.inlineCallbacks
|
||||||
def test_avatar_url(self):
|
def test_avatar_url(self):
|
||||||
yield self.store.create_profile(self.u_frank.localpart)
|
|
||||||
|
|
||||||
yield self.store.set_profile_avatar_url(
|
yield self.store.set_profile_avatar_url(
|
||||||
self.u_frank.localpart, "http://my.site/here", 1,
|
self.u_frank.localpart, "http://my.site/here", 1,
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in a new issue