From dfba2b18e78fa7e0c24e162886c13398bfb257ab Mon Sep 17 00:00:00 2001 From: Ben Brooks Date: Wed, 25 Sep 2024 07:57:18 +0100 Subject: [PATCH] Add missing dbConfig.setup in dbinitmanager tests --- rest/database_init_manager.go | 2 +- rest/database_init_manager_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/rest/database_init_manager.go b/rest/database_init_manager.go index 3928466497..7430ad465d 100644 --- a/rest/database_init_manager.go +++ b/rest/database_init_manager.go @@ -100,7 +100,7 @@ func (m *DatabaseInitManager) InitializeDatabase(ctx context.Context, startupCon // Start a goroutine to perform the initialization go func() { - defer n1qlStore.Close() + defer func() { _ = n1qlStore.Close() }() defer couchbaseCluster.Close() // worker.Run blocks until completion, and returns any error on doneChan. worker.Run() diff --git a/rest/database_init_manager_test.go b/rest/database_init_manager_test.go index b53ef05c96..3c8c1e8ffb 100644 --- a/rest/database_init_manager_test.go +++ b/rest/database_init_manager_test.go @@ -433,6 +433,7 @@ func TestDatabaseInitTeardownTiming(t *testing.T) { } dbName := "dbName" dbConfig := makeDbConfig(tb.GetName(), dbName, collection1and2ScopesConfig) + require.NoError(t, dbConfig.setup(ctx, dbName, sc.Config.Bootstrap, nil, nil, false)) wg := &sync.WaitGroup{} wg.Add(1)