Fix CI and test.WithAllDatabases
@@ -77,32 +77,6 @@ func TestAppserviceInternalAPI(t *testing.T) {
}
}))
- // TODO: use test.WithAllDatabases
- // only one DBType, since appservice.AddInternalRoutes complains about multiple prometheus counters added
- base, closeBase := testrig.CreateBaseDendrite(t, test.DBTypeSQLite)
- defer closeBase()
-
- // Create a dummy application service
- base.Cfg.AppServiceAPI.Derived.ApplicationServices = []config.ApplicationService{
- {
- ID: "someID",
- URL: srv.URL,
- ASToken: "",
- HSToken: "",
- SenderLocalpart: "senderLocalPart",
- NamespaceMap: map[string][]config.ApplicationServiceNamespace{
- "users": {{RegexpObject: regexp.MustCompile("as-.*")}},
- "aliases": {{RegexpObject: regexp.MustCompile("asroom-.*")}},
- },
- Protocols: []string{existingProtocol},
- },
- }
-
- // Create required internal APIs
- rsAPI := roomserver.NewInternalAPI(base)
- usrAPI := userapi.NewInternalAPI(base, &base.Cfg.UserAPI, nil, nil, rsAPI, nil)
- asAPI := appservice.NewInternalAPI(base, usrAPI, rsAPI)
-
// The test cases to run
runCases := func(t *testing.T, testAPI api.AppServiceInternalAPI) {
t.Run("UserIDExists", func(t *testing.T) {
@@ -133,10 +107,35 @@ func TestAppserviceInternalAPI(t *testing.T) {
})
}
+ test.WithAllDatabases(t, func(t *testing.T, dbType test.DBType) {
+ base, closeBase := testrig.CreateBaseDendrite(t, test.DBTypeSQLite)
+ defer closeBase()
+
+ // Create a dummy application service
+ base.Cfg.AppServiceAPI.Derived.ApplicationServices = []config.ApplicationService{
+ {
+ ID: "someID",
+ URL: srv.URL,
+ ASToken: "",
+ HSToken: "",
+ SenderLocalpart: "senderLocalPart",
+ NamespaceMap: map[string][]config.ApplicationServiceNamespace{
+ "users": {{RegexpObject: regexp.MustCompile("as-.*")}},
+ "aliases": {{RegexpObject: regexp.MustCompile("asroom-.*")}},
+ },
+ Protocols: []string{existingProtocol},
+ },
+ }
+
+ // Create required internal APIs
+ rsAPI := roomserver.NewInternalAPI(base)
+ usrAPI := userapi.NewInternalAPI(base, &base.Cfg.UserAPI, nil, nil, rsAPI, nil)
+ asAPI := appservice.NewInternalAPI(base, usrAPI, rsAPI)
+
// Finally execute the tests
t.Run("HTTP API", func(t *testing.T) {
router := mux.NewRouter().PathPrefix(httputil.InternalPathPrefix).Subrouter()
- appservice.AddInternalRoutes(router, asAPI)
+ appservice.AddInternalRoutes(router, asAPI, base.EnableMetrics)
apiURL, cancel := test.ListenAndServe(t, router, false)
defer cancel()
@@ -150,7 +149,7 @@ func TestAppserviceInternalAPI(t *testing.T) {
t.Run("Monolith", func(t *testing.T) {
runCases(t, asAPI)
})
-
+ })
}
func testUserIDExists(t *testing.T, asAPI api.AppServiceInternalAPI, userID string, wantExists bool) {
