From 03a5a2c3b3a1658e23584a0deb2c8f5cefb17b32 Mon Sep 17 00:00:00 2001 From: tsmethurst Date: Tue, 12 Oct 2021 18:24:03 +0200 Subject: [PATCH] test fixes --- internal/api/client/user/user_test.go | 7 ++----- internal/processing/user/user_test.go | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/internal/api/client/user/user_test.go b/internal/api/client/user/user_test.go index 4c68ce4fb..02f10b5ae 100644 --- a/internal/api/client/user/user_test.go +++ b/internal/api/client/user/user_test.go @@ -49,15 +49,12 @@ type UserStandardTestSuite struct { userModule *user.Module } -func (suite *UserStandardTestSuite) SetupSuite() { +func (suite *UserStandardTestSuite) SetupTest() { suite.testTokens = testrig.NewTestTokens() suite.testClients = testrig.NewTestClients() suite.testApplications = testrig.NewTestApplications() suite.testUsers = testrig.NewTestUsers() suite.testAccounts = testrig.NewTestAccounts() -} - -func (suite *UserStandardTestSuite) SetupTest() { suite.config = testrig.NewTestConfig() suite.db = testrig.NewTestDB() suite.storage = testrig.NewTestStorage() @@ -66,7 +63,7 @@ func (suite *UserStandardTestSuite) SetupTest() { suite.federator = testrig.NewTestFederator(suite.db, testrig.NewTestTransportController(testrig.NewMockHTTPClient(nil), suite.db), suite.storage) suite.processor = testrig.NewTestProcessor(suite.db, suite.storage, suite.federator) suite.userModule = user.New(suite.config, suite.processor).(*user.Module) - testrig.StandardDBSetup(suite.db, nil) + testrig.StandardDBSetup(suite.db, suite.testAccounts) testrig.StandardStorageSetup(suite.storage, "../../../../testrig/media") } diff --git a/internal/processing/user/user_test.go b/internal/processing/user/user_test.go index b843f76ae..4f18e03c2 100644 --- a/internal/processing/user/user_test.go +++ b/internal/processing/user/user_test.go @@ -47,6 +47,6 @@ func (suite *UserStandardTestSuite) SetupTest() { testrig.StandardDBSetup(suite.db, nil) } -func (suite *UserStandardTestSuite) TeardownTest() { +func (suite *UserStandardTestSuite) TearDownTest() { testrig.StandardDBTeardown(suite.db) }