From 986b5a3c1b4cc3ab11711068533c88903593f029 Mon Sep 17 00:00:00 2001 From: Arnau Date: Thu, 28 Nov 2024 09:56:27 -0600 Subject: [PATCH] fix conflicts --- aggregator/db/dbstorage/proof_test.go | 3 ++- aggregator/db/migrations_test.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aggregator/db/dbstorage/proof_test.go b/aggregator/db/dbstorage/proof_test.go index f8095086a..5d7e4ca4c 100644 --- a/aggregator/db/dbstorage/proof_test.go +++ b/aggregator/db/dbstorage/proof_test.go @@ -3,6 +3,7 @@ package dbstorage import ( "context" "math" + "path" "testing" "time" @@ -19,7 +20,7 @@ var ( ) func Test_Proof(t *testing.T) { - dbPath := "file::memory:?cache=shared" + dbPath := path.Join(t.TempDir(), "Test_Proof.sqlite") err := db.RunMigrationsUp(dbPath, db.AggregatorMigrationName) assert.NoError(t, err) diff --git a/aggregator/db/migrations_test.go b/aggregator/db/migrations_test.go index 317178e90..aaf5e08e9 100644 --- a/aggregator/db/migrations_test.go +++ b/aggregator/db/migrations_test.go @@ -1,6 +1,7 @@ package db import ( + "path" "testing" migrate "github.com/rubenv/sql-migrate" @@ -18,7 +19,7 @@ func Test_checkMigrations(t *testing.T) { } func Test_runMigrations(t *testing.T) { - dbPath := "file::memory:?cache=shared" + dbPath := path.Join(t.TempDir(), "Test_runMigrations.sqlite") err := runMigrations(dbPath, AggregatorMigrationName, migrate.Up) assert.NoError(t, err)