From d216eea8791ef8532c7cd7aa63323826b4d50368 Mon Sep 17 00:00:00 2001 From: Till Faelligen <2353100+S7evinK@users.noreply.github.com> Date: Fri, 1 Dec 2023 12:12:32 +0100 Subject: [PATCH] Give every test a unique room --- appservice/appservice_test.go | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/appservice/appservice_test.go b/appservice/appservice_test.go index a5130e342..8b5c1a32e 100644 --- a/appservice/appservice_test.go +++ b/appservice/appservice_test.go @@ -423,12 +423,6 @@ func TestRoomserverConsumerOneInvite(t *testing.T) { func TestOutputAppserviceEvent(t *testing.T) { alice := test.NewUser(t) bob := test.NewUser(t) - room := test.NewRoom(t, alice) - - // Invite Bob - room.CreateAndInsert(t, alice, spec.MRoomMember, map[string]interface{}{ - "membership": "invite", - }, test.WithStateKey(bob.ID)) test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) { cfg, processCtx, closeDB := testrig.CreateConfig(t, dbType) @@ -454,6 +448,13 @@ func TestOutputAppserviceEvent(t *testing.T) { clientapi.AddPublicRoutes(processCtx, routers, cfg, natsInstance, nil, rsAPI, nil, nil, nil, usrAPI, nil, nil, caching.DisableMetrics) createAccessTokens(t, accessTokens, usrAPI, processCtx.Context(), routers) + room := test.NewRoom(t, alice) + + // Invite Bob + room.CreateAndInsert(t, alice, spec.MRoomMember, map[string]interface{}{ + "membership": "invite", + }, test.WithStateKey(bob.ID)) + // create a dummy AS url, handling the events srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { var txn consumers.ApplicationServiceTransaction