Skip to content

Commit d2ed38c

Browse files
committed
refactor: replace InitDB with New for database initialization in tests
1 parent 6f4afc7 commit d2ed38c

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

cmd/keymaster/debug_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313

1414
func TestDebugAddAccount(t *testing.T) {
1515
dbdsn := "file:TestDebugAddAccount?mode=memory&cache=shared"
16-
// configure viper indirectly by calling db.InitDB (simulate setupTestDB)
17-
if err := db.InitDB("sqlite", dbdsn); err != nil {
18-
t.Fatalf("InitDB failed: %v", err)
16+
// configure viper indirectly by calling db.New (simulate setupTestDB)
17+
if _, err := db.New("sqlite", dbdsn); err != nil {
18+
t.Fatalf("db.New failed: %v", err)
1919
}
2020
mgr := db.DefaultAccountManager()
2121
if mgr == nil {

cmd/keymaster/main_cmd_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ func TestNewRootCmd_RegistersSubcommandsAndVersion(t *testing.T) {
6161
func TestRunParallelTasks_PrintsResultsAndLogs(t *testing.T) {
6262
// Initialize i18n and in-memory DB so logging doesn't fail
6363
i18n.Init("en")
64-
if err := db.InitDB("sqlite", ":memory:"); err != nil {
65-
t.Fatalf("db.InitDB failed: %v", err)
64+
if _, err := db.New("sqlite", ":memory:"); err != nil {
65+
t.Fatalf("db.New failed: %v", err)
6666
}
6767

6868
// Prepare accounts

cmd/keymaster/main_deploy_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414

1515
func TestRunDeploymentForAccount_NoActiveSystemKey_ReturnsError(t *testing.T) {
1616
i18n.Init("en")
17-
if err := db.InitDB("sqlite", ":memory:"); err != nil {
18-
t.Fatalf("db.InitDB failed: %v", err)
17+
if _, err := db.New("sqlite", ":memory:"); err != nil {
18+
t.Fatalf("db.New failed: %v", err)
1919
}
2020

2121
acct := model.Account{ID: 1, Username: "u", Hostname: "h", Serial: 0}
@@ -27,8 +27,8 @@ func TestRunDeploymentForAccount_NoActiveSystemKey_ReturnsError(t *testing.T) {
2727

2828
func TestRunDeploymentForAccount_MissingSerialKey_ReturnsError(t *testing.T) {
2929
i18n.Init("en")
30-
if err := db.InitDB("sqlite", ":memory:"); err != nil {
31-
t.Fatalf("db.InitDB failed: %v", err)
30+
if _, err := db.New("sqlite", ":memory:"); err != nil {
31+
t.Fatalf("db.New failed: %v", err)
3232
}
3333

3434
acct := model.Account{ID: 1, Username: "u", Hostname: "h", Serial: 999}

cmd/keymaster/main_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ func setupTestDB(t *testing.T) {
3939

4040
// Initialize i18n and the database
4141
i18n.Init("en")
42-
if err := db.InitDB("sqlite", dsn); err != nil {
42+
if _, err := db.New("sqlite", dsn); err != nil {
4343
t.Fatalf("Failed to initialize test database: %v", err)
4444
}
4545
}

cmd/keymaster/transfer_cli_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ func (t *testDeployer) Close() {}
2121
// TestTransferCLI_CreateAndAccept runs the `transfer create` then `transfer accept` CLI paths.
2222
func TestTransferCLI_CreateAndAccept(t *testing.T) {
2323
// Use an isolated DB per test
24-
if err := db.InitDB("sqlite", ":memory:"); err != nil {
25-
t.Fatalf("InitDB failed: %v", err)
24+
if _, err := db.New("sqlite", ":memory:"); err != nil {
25+
t.Fatalf("db.New failed: %v", err)
2626
}
2727

2828
tmpdir := t.TempDir()

0 commit comments

Comments
 (0)