From 10dc02f1eace1df6c55a3e0da31675c041ded96e Mon Sep 17 00:00:00 2001 From: Till Faelligen Date: Wed, 4 May 2022 18:38:43 +0200 Subject: [PATCH] Debugging unit tests.. --- setup/base/base.go | 1 + userapi/storage/shared/storage.go | 2 ++ userapi/storage/sqlite3/storage.go | 3 +++ userapi/userapi_test.go | 1 + 4 files changed, 7 insertions(+) diff --git a/setup/base/base.go b/setup/base/base.go index 3641ad780..10f36fee6 100644 --- a/setup/base/base.go +++ b/setup/base/base.go @@ -259,6 +259,7 @@ func (b *BaseDendrite) Close() error { func (b *BaseDendrite) DatabaseConnection(dbProperties *config.DatabaseOptions, writer sqlutil.Writer) (*sql.DB, sqlutil.Writer, error) { if dbProperties.ConnectionString != "" || b == nil { // Open a new database connection using the supplied config. + logrus.Infof("Open a new database connection using the supplied config.: %+v", dbProperties.ConnectionString) db, err := sqlutil.Open(dbProperties, writer) return db, writer, err } diff --git a/userapi/storage/shared/storage.go b/userapi/storage/shared/storage.go index fd7511a09..aacf492c1 100644 --- a/userapi/storage/shared/storage.go +++ b/userapi/storage/shared/storage.go @@ -27,6 +27,7 @@ import ( "time" "github.com/matrix-org/gomatrixserverlib" + "github.com/sirupsen/logrus" "golang.org/x/crypto/bcrypt" "github.com/matrix-org/dendrite/clientapi/auth/authtypes" @@ -159,6 +160,7 @@ func (d *Database) createAccount( } } if account, err = d.Accounts.InsertAccount(ctx, txn, localpart, hash, appserviceID, policyVersion, accountType); err != nil { + logrus.WithError(err).Error("d.Accounts.InsertAccount error") return nil, sqlutil.ErrUserExists } if err = d.Profiles.InsertProfile(ctx, txn, localpart); err != nil { diff --git a/userapi/storage/sqlite3/storage.go b/userapi/storage/sqlite3/storage.go index 459718b36..504474bd1 100644 --- a/userapi/storage/sqlite3/storage.go +++ b/userapi/storage/sqlite3/storage.go @@ -19,6 +19,7 @@ import ( "time" "github.com/matrix-org/gomatrixserverlib" + "github.com/sirupsen/logrus" "github.com/matrix-org/dendrite/internal/sqlutil" "github.com/matrix-org/dendrite/setup/base" @@ -44,6 +45,7 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions, // preparing statements for columns that don't exist yet return nil, err } + logrus.Info("created account_accounts table") deltas.LoadIsActive(m) //deltas.LoadLastSeenTSIP(m) deltas.LoadAddAccountType(m) @@ -60,6 +62,7 @@ func NewDatabase(base *base.BaseDendrite, dbProperties *config.DatabaseOptions, if err != nil { return nil, fmt.Errorf("NewSQLiteAccountsTable: %w", err) } + logrus.Info("prepared statements for accounts table") devicesTable, err := NewSQLiteDevicesTable(db, serverName) if err != nil { return nil, fmt.Errorf("NewSQLiteDevicesTable: %w", err) diff --git a/userapi/userapi_test.go b/userapi/userapi_test.go index a9e3b67e4..b541ce012 100644 --- a/userapi/userapi_test.go +++ b/userapi/userapi_test.go @@ -73,6 +73,7 @@ func TestQueryProfile(t *testing.T) { aliceAvatarURL := "mxc://example.com/alice" aliceDisplayName := "Alice" userAPI, accountDB := MustMakeInternalAPI(t, apiTestOpts{}) + time.Sleep(time.Second) _, err := accountDB.CreateAccount(context.TODO(), "alice", "foobar", "", "", api.AccountTypeUser) if err != nil { t.Fatalf("failed to make account: %s", err)