From 9498cd3e7b6166b1f3a61f828c79036def7a4aae Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Mon, 22 Oct 2018 20:27:25 +0200
Subject: [PATCH] fix conflict and reinstate
 6372dff771413c2b9cd5648cbb6de01a679ef801

---
 tests/storage/test_profile.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/storage/test_profile.py b/tests/storage/test_profile.py
index 8d258f9eec..dc3a2fd976 100644
--- a/tests/storage/test_profile.py
+++ b/tests/storage/test_profile.py
@@ -34,8 +34,6 @@ class ProfileStoreTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def test_displayname(self):
-        yield self.store.create_profile(self.u_frank.localpart)
-
         yield self.store.set_profile_displayname(
             self.u_frank.localpart, "Frank", 1,
         )
@@ -47,8 +45,6 @@ class ProfileStoreTestCase(unittest.TestCase):
 
     @defer.inlineCallbacks
     def test_avatar_url(self):
-        yield self.store.create_profile(self.u_frank.localpart)
-
         yield self.store.set_profile_avatar_url(
             self.u_frank.localpart, "http://my.site/here", 1,
         )