github/prysm
1
1
Fork 0
mirror of https://github.com/OffchainLabs/prysm.git synced 2026-01-09 15:37:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use the T.TempDir and B.TempDir to create temp dirs for testing (#10560)

Browse Source 
* Use t.TempDir and b.TempDir for temporary test dirs

* Remove redundant dir cleanup
This commit is contained in:
Håvard Anda Estensen
2022-04-21 22:45:44 +02:00
committed by GitHub
parent 21fc9853ee
commit 2fd7c926ed
9 changed files with 10 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
validator/rpc/auth_token_test.go
View File

@@ -16,9 +16,6 @@ import (
func setupWalletDir(t testing.TB) string {
walletDir := filepath.Join(t.TempDir(), "wallet")
require.NoError(t, os.MkdirAll(walletDir, os.ModePerm))
t.Cleanup(func() {
require.NoError(t, os.RemoveAll(walletDir))
})
return walletDir
}
@@ -102,7 +99,6 @@ func Test_initializeAuthToken(t *testing.T) {
// Deleting the auth token and re-initializing means we create a jwt token
// and secret from scratch again.
require.NoError(t, os.RemoveAll(walletDir))
srv3 := &Server{}
walletDir = setupWalletDir(t)
token3, err := srv3.initializeAuthToken(walletDir)

10
validator/rpc/wallet_test.go
View File

@@ -4,7 +4,6 @@ import (
"context"
"encoding/json"
"fmt"
"os"
"path/filepath"
"testing"
@@ -62,9 +61,6 @@ func TestServer_CreateWallet_Local(t *testing.T) {
Keymanager: pb.KeymanagerKind_IMPORTED,
WalletPassword: strongPass,
}
// We delete the directory at defaultWalletPath as CreateWallet will return an error if it tries to create a wallet
// where a directory already exists
require.NoError(t, os.RemoveAll(defaultWalletPath))
_, err = s.CreateWallet(ctx, req)
require.NoError(t, err)
@@ -113,9 +109,6 @@ func TestServer_CreateWallet_Local_PasswordTooWeak(t *testing.T) {
Keymanager: pb.KeymanagerKind_IMPORTED,
WalletPassword: "", // Weak password, empty string
}
// We delete the directory at defaultWalletPath as CreateWallet will return an error if it tries to create a wallet
// where a directory already exists
require.NoError(t, os.RemoveAll(defaultWalletPath))
_, err := s.CreateWallet(ctx, req)
require.ErrorContains(t, "Password too weak", err)
@@ -138,9 +131,6 @@ func TestServer_RecoverWallet_Derived(t *testing.T) {
WalletPassword: strongPass,
NumAccounts: 0,
}
// We delete the directory at defaultWalletPath as RecoverWallet will return an error if it tries to create a wallet
// where a directory already exists
require.NoError(t, os.RemoveAll(localWalletDir))
_, err := s.RecoverWallet(ctx, req)
require.ErrorContains(t, "Must create at least 1 validator account", err)