From 7c3ac7150d65357555c8aa1fb4ae80b66aa627d7 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Mon, 24 Oct 2022 15:45:13 +0300 Subject: [PATCH] [#1959] neofs-adm: Remove `newTempDir` function Signed-off-by: Evgenii Stratonikov --- cmd/neofs-adm/internal/modules/morph/generate_test.go | 11 +---------- .../internal/modules/morph/initialize_test.go | 2 +- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/cmd/neofs-adm/internal/modules/morph/generate_test.go b/cmd/neofs-adm/internal/modules/morph/generate_test.go index da4a7c73..5749a14f 100644 --- a/cmd/neofs-adm/internal/modules/morph/generate_test.go +++ b/cmd/neofs-adm/internal/modules/morph/generate_test.go @@ -24,7 +24,7 @@ const testContractPassword = "grouppass" func TestGenerateAlphabet(t *testing.T) { const size = 4 - walletDir := newTempDir(t) + walletDir := t.TempDir() buf := setupTestTerminal(t) cmd := generateAlphabetCmd @@ -110,12 +110,3 @@ func setupTestTerminal(t *testing.T) *bytes.Buffer { return in } - -func newTempDir(t *testing.T) string { - dir := filepath.Join(t.TempDir(), "neofs-adm.test."+strconv.FormatUint(rand.Uint64(), 10)) - require.NoError(t, os.Mkdir(dir, os.ModePerm)) - t.Cleanup(func() { - require.NoError(t, os.RemoveAll(dir)) - }) - return dir -} diff --git a/cmd/neofs-adm/internal/modules/morph/initialize_test.go b/cmd/neofs-adm/internal/modules/morph/initialize_test.go index ef79ca02..fc1f867e 100644 --- a/cmd/neofs-adm/internal/modules/morph/initialize_test.go +++ b/cmd/neofs-adm/internal/modules/morph/initialize_test.go @@ -35,7 +35,7 @@ func TestInitialize(t *testing.T) { } func testInitialize(t *testing.T, committeeSize int) { - testdataDir := newTempDir(t) + testdataDir := t.TempDir() v := viper.GetViper() generateTestData(t, testdataDir, committeeSize)