Clean up temp files more thoroughly after testing. (#7815)

Our test cases spew a lot of files and directories around $TMPDIR.  Make more
thorough use of the testing package's TempDir methods to ensure these are
cleaned up.

In a few cases, this required plumbing test contexts through existing helper
code. In a couple places an explicit path was required, to work around cases
where we do global setup during a TestMain function. Those cases probably
deserve more thorough cleansing (preferably with fire), but for now I have just
worked around it to keep focused on the cleanup.
This commit is contained in:
M. J. Fromberger
2022-02-14 06:32:07 -08:00
committed by GitHub
parent 824960c565
commit 7e09c2ef43
39 changed files with 151 additions and 215 deletions

View File

@@ -39,7 +39,7 @@ import (
)
func TestNodeStartStop(t *testing.T) {
cfg, err := config.ResetTestRoot("node_node_test")
cfg, err := config.ResetTestRoot(t.TempDir(), "node_node_test")
require.NoError(t, err)
defer os.RemoveAll(cfg.RootDir)
@@ -104,7 +104,7 @@ func getTestNode(ctx context.Context, t *testing.T, conf *config.Config, logger
}
func TestNodeDelayedStart(t *testing.T) {
cfg, err := config.ResetTestRoot("node_delayed_start_test")
cfg, err := config.ResetTestRoot(t.TempDir(), "node_delayed_start_test")
require.NoError(t, err)
defer os.RemoveAll(cfg.RootDir)
@@ -126,7 +126,7 @@ func TestNodeDelayedStart(t *testing.T) {
}
func TestNodeSetAppVersion(t *testing.T) {
cfg, err := config.ResetTestRoot("node_app_version_test")
cfg, err := config.ResetTestRoot(t.TempDir(), "node_app_version_test")
require.NoError(t, err)
defer os.RemoveAll(cfg.RootDir)
@@ -159,7 +159,7 @@ func TestNodeSetPrivValTCP(t *testing.T) {
logger := log.NewNopLogger()
cfg, err := config.ResetTestRoot("node_priv_val_tcp_test")
cfg, err := config.ResetTestRoot(t.TempDir(), "node_priv_val_tcp_test")
require.NoError(t, err)
defer os.RemoveAll(cfg.RootDir)
cfg.PrivValidator.ListenAddr = addr
@@ -196,7 +196,7 @@ func TestPrivValidatorListenAddrNoProtocol(t *testing.T) {
addrNoPrefix := testFreeAddr(t)
cfg, err := config.ResetTestRoot("node_priv_val_tcp_test")
cfg, err := config.ResetTestRoot(t.TempDir(), "node_priv_val_tcp_test")
require.NoError(t, err)
defer os.RemoveAll(cfg.RootDir)
cfg.PrivValidator.ListenAddr = addrNoPrefix
@@ -220,7 +220,7 @@ func TestNodeSetPrivValIPC(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
cfg, err := config.ResetTestRoot("node_priv_val_tcp_test")
cfg, err := config.ResetTestRoot(t.TempDir(), "node_priv_val_tcp_test")
require.NoError(t, err)
defer os.RemoveAll(cfg.RootDir)
cfg.PrivValidator.ListenAddr = "unix://" + tmpfile
@@ -267,7 +267,7 @@ func TestCreateProposalBlock(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
cfg, err := config.ResetTestRoot("node_create_proposal")
cfg, err := config.ResetTestRoot(t.TempDir(), "node_create_proposal")
require.NoError(t, err)
defer os.RemoveAll(cfg.RootDir)
@@ -364,7 +364,7 @@ func TestMaxTxsProposalBlockSize(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
cfg, err := config.ResetTestRoot("node_create_proposal")
cfg, err := config.ResetTestRoot(t.TempDir(), "node_create_proposal")
require.NoError(t, err)
defer os.RemoveAll(cfg.RootDir)
@@ -432,7 +432,7 @@ func TestMaxProposalBlockSize(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()
cfg, err := config.ResetTestRoot("node_create_proposal")
cfg, err := config.ResetTestRoot(t.TempDir(), "node_create_proposal")
require.NoError(t, err)
defer os.RemoveAll(cfg.RootDir)
@@ -547,7 +547,7 @@ func TestMaxProposalBlockSize(t *testing.T) {
}
func TestNodeNewSeedNode(t *testing.T) {
cfg, err := config.ResetTestRoot("node_new_node_custom_reactors_test")
cfg, err := config.ResetTestRoot(t.TempDir(), "node_new_node_custom_reactors_test")
require.NoError(t, err)
cfg.Mode = config.ModeSeed
defer os.RemoveAll(cfg.RootDir)
@@ -585,7 +585,7 @@ func TestNodeNewSeedNode(t *testing.T) {
}
func TestNodeSetEventSink(t *testing.T) {
cfg, err := config.ResetTestRoot("node_app_version_test")
cfg, err := config.ResetTestRoot(t.TempDir(), "node_app_version_test")
require.NoError(t, err)
defer os.RemoveAll(cfg.RootDir)
@@ -725,7 +725,7 @@ func loadStatefromGenesis(ctx context.Context, t *testing.T) sm.State {
stateDB := dbm.NewMemDB()
stateStore := sm.NewStore(stateDB)
cfg, err := config.ResetTestRoot("load_state_from_genesis")
cfg, err := config.ResetTestRoot(t.TempDir(), "load_state_from_genesis")
require.NoError(t, err)
loadedState, err := stateStore.Load()