From 60ee092cfcac4686c817b0390254d456d435adea Mon Sep 17 00:00:00 2001 From: Paul Bellamy Date: Mon, 21 Mar 2022 16:29:21 +0000 Subject: [PATCH] PR feedback --- ingest/ledgerbackend/captive_core_backend_test.go | 6 ++++-- ingest/ledgerbackend/file_watcher_test.go | 6 ++++-- ingest/ledgerbackend/stellar_core_runner_test.go | 9 ++++++--- services/horizon/internal/integration/parameters_test.go | 2 +- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/ingest/ledgerbackend/captive_core_backend_test.go b/ingest/ledgerbackend/captive_core_backend_test.go index 481a1e3c1d..6138bb1293 100644 --- a/ingest/ledgerbackend/captive_core_backend_test.go +++ b/ingest/ledgerbackend/captive_core_backend_test.go @@ -133,8 +133,9 @@ type testLedgerHeader struct { } func TestCaptiveNew(t *testing.T) { - storagePath, err := os.MkdirTemp(os.TempDir(), "captive-core-*") + storagePath, err := os.MkdirTemp("", "captive-core-*") require.NoError(t, err) + defer os.RemoveAll(storagePath) executablePath := "/etc/stellar-core" networkPassphrase := network.PublicNetworkPassphrase @@ -827,8 +828,9 @@ func TestCaptiveGetLedger_NextLedger0RangeFromIsSmallerThanLedgerFromBuffer(t *t } func TestCaptiveStellarCore_PrepareRangeAfterClose(t *testing.T) { - storagePath, err := os.MkdirTemp(os.TempDir(), "captive-core-*") + storagePath, err := os.MkdirTemp("", "captive-core-*") require.NoError(t, err) + defer os.RemoveAll(storagePath) ctx := context.Background() executablePath := "/etc/stellar-core" diff --git a/ingest/ledgerbackend/file_watcher_test.go b/ingest/ledgerbackend/file_watcher_test.go index ed5d4a3fc7..837ab1166b 100644 --- a/ingest/ledgerbackend/file_watcher_test.go +++ b/ingest/ledgerbackend/file_watcher_test.go @@ -45,8 +45,9 @@ func (m *mockHash) hashFile(fp string) (hash, error) { } func createFWFixtures(t *testing.T) (*mockHash, *stellarCoreRunner, *fileWatcher) { - storagePath, err := os.MkdirTemp(os.TempDir(), "captive-core-*") + storagePath, err := os.MkdirTemp("", "captive-core-*") require.NoError(t, err) + defer os.RemoveAll(storagePath) ms := &mockHash{ hashResult: hash{}, @@ -75,8 +76,9 @@ func createFWFixtures(t *testing.T) (*mockHash, *stellarCoreRunner, *fileWatcher } func TestNewFileWatcherError(t *testing.T) { - storagePath, err := os.MkdirTemp(os.TempDir(), "captive-core-*") + storagePath, err := os.MkdirTemp("", "captive-core-*") require.NoError(t, err) + defer os.RemoveAll(storagePath) ms := &mockHash{ hashResult: hash{}, diff --git a/ingest/ledgerbackend/stellar_core_runner_test.go b/ingest/ledgerbackend/stellar_core_runner_test.go index 5b7a12a5a2..54f13e05de 100644 --- a/ingest/ledgerbackend/stellar_core_runner_test.go +++ b/ingest/ledgerbackend/stellar_core_runner_test.go @@ -13,8 +13,9 @@ import ( ) func TestCloseBeforeStartOffline(t *testing.T) { - storagePath, err := os.MkdirTemp(os.TempDir(), "captive-core-*") + storagePath, err := os.MkdirTemp("", "captive-core-*") require.NoError(t, err) + defer os.RemoveAll(storagePath) captiveCoreToml, err := NewCaptiveCoreToml(CaptiveCoreTomlParams{}) assert.NoError(t, err) @@ -42,8 +43,9 @@ func TestCloseBeforeStartOffline(t *testing.T) { } func TestCloseBeforeStartOnline(t *testing.T) { - storagePath, err := os.MkdirTemp(os.TempDir(), "captive-core-*") + storagePath, err := os.MkdirTemp("", "captive-core-*") require.NoError(t, err) + defer os.RemoveAll(storagePath) captiveCoreToml, err := NewCaptiveCoreToml(CaptiveCoreTomlParams{}) assert.NoError(t, err) @@ -72,8 +74,9 @@ func TestCloseBeforeStartOnline(t *testing.T) { } func TestCloseBeforeStartOnlineWithError(t *testing.T) { - storagePath, err := os.MkdirTemp(os.TempDir(), "captive-core-*") + storagePath, err := os.MkdirTemp("", "captive-core-*") require.NoError(t, err) + defer os.RemoveAll(storagePath) captiveCoreToml, err := NewCaptiveCoreToml(CaptiveCoreTomlParams{}) assert.NoError(t, err) diff --git a/services/horizon/internal/integration/parameters_test.go b/services/horizon/internal/integration/parameters_test.go index 3679b146e3..a3edd3ec71 100644 --- a/services/horizon/internal/integration/parameters_test.go +++ b/services/horizon/internal/integration/parameters_test.go @@ -244,7 +244,7 @@ func createCaptiveCoreConfig(contents string) (string, string, func()) { panic(err) } - storagePath, err := ioutil.TempDir("", "captive-core-test-*-storage") + storagePath, err := os.MkdirTemp("", "captive-core-test-*-storage") if err != nil { panic(err) }