fix: refactor WatchaRoomEventsStoreTestCase cause new assert raise 'p…

…rev_events' in 'create_new_client_event'. ([\#8041](matrix-org/synapse#8041)

tests/storage/test_room.py

@@ -148,25 +148,20 @@ def STALE_test_room_topic(self):
 
 
 # insertion for watcha - OP433
-class WatchaRoomEventsStoreTestCase(unittest.TestCase):
-    @defer.inlineCallbacks
-    def setUp(self):
-        hs = setup_test_homeserver(self.addCleanup)
-
-        self.storage = hs.get_storage()
+class WatchaRoomEventsStoreTestCase(unittest.HomeserverTestCase):
+    def prepare(self, reactor, clock, hs):
         self.event_builder_factory = hs.get_event_builder_factory()
         self.event_creation_handler = hs.get_event_creation_handler()
         self.store = hs.get_datastore()
-        self.d = hs.get_datastore()
+        self.storage = hs.get_storage()
         self.user = UserID.from_string("@user:test")
         self.room = RoomID.from_string("!abc123:test")
         self.nextcloud_folder_url = "http://test.watcha.fr/nextcloud/apps/files/?dir=/test_folder"
 
-        yield self._send_room_mapping_event(self.nextcloud_folder_url)
+        self.get_success(create_room(hs, self.room.to_string(), self.user.to_string()))
 
-        yield create_room(hs, self.room.to_string(), self.user.to_string())
+        self.get_success(self._send_room_mapping_event(self.nextcloud_folder_url))
 
-    @defer.inlineCallbacks
     def _send_room_mapping_event(self, nextcloud_folder_url):
         builder = self.event_builder_factory.for_room_version(
             RoomVersions.V1,
@@ -178,45 +173,42 @@ def _send_room_mapping_event(self, nextcloud_folder_url):
             },
         )
 
-        event, context = yield defer.ensureDeferred(
+        event, context = self.get_success(
             self.event_creation_handler.create_new_client_event(builder)
         )
 
-        yield self.storage.persistence.persist_event(event, context)
+        self.get_success(self.storage.persistence.persist_event(event, context))
 
-    @defer.inlineCallbacks
     def test_insert_new_room_link_with_NC(self):
 
-        result = yield self.store.db.simple_select_onecol(
+        result = self.get_success(self.store.db_pool.simple_select_onecol(
             table="room_mapping_with_NC",
             keyvalues={"room_id": self.room.to_string()},
             retcol="link_url",
-        )
+        ))
 
         self.assertEquals(result[0], self.nextcloud_folder_url)
 
-    @defer.inlineCallbacks
     def test_update_room_link_with_NC(self):
         new_nextcloud_folder_url = "http://test.watcha.fr/nextcloud/apps/files/?dir=/test_folder2"
-        yield self._send_room_mapping_event(new_nextcloud_folder_url)
+        self._send_room_mapping_event(new_nextcloud_folder_url)
 
-        result = yield self.store.db.simple_select_onecol(
+        result = self.get_success(self.store.db_pool.simple_select_onecol(
             table="room_mapping_with_NC",
             keyvalues={"room_id": self.room.to_string()},
             retcol="link_url",
-        )
+        ))
 
         self.assertEquals(result[0], new_nextcloud_folder_url)
 
-    @defer.inlineCallbacks
     def test_delete_room_link_with_NC(self):
-        yield self._send_room_mapping_event("")
+        self._send_room_mapping_event("")
 
-        result = yield self.store.db.simple_select_onecol(
+        result = self.get_success(self.store.db_pool.simple_select_onecol(
             table="room_mapping_with_NC",
             keyvalues={"room_id": self.room.to_string()},
             retcol="link_url",
-        )
+        ))
 
         self.assertFalse(result)
 # end of insertion