all: use T.TempDir to create temporary test directories

accounts/abi/bind/bind_test.go

@@ -1966,14 +1966,10 @@ func TestGolangBindings(t *testing.T) {
  t.Skip("go sdk not found for testing")
  }
  // Create a temporary workspace for the test suite
- ws, err := ioutil.TempDir("", "binding-test")
- if err != nil {
- t.Fatalf("failed to create temporary workspace: %v", err)
- }
- //defer os.RemoveAll(ws)
+ ws := t.TempDir()
 
  pkg := filepath.Join(ws, "bindtest")
- if err = os.MkdirAll(pkg, 0700); err != nil {
+ if err := os.MkdirAll(pkg, 0700); err != nil {
  t.Fatalf("failed to create package: %v", err)
  }
  // Generate the test suite for all the contracts

accounts/keystore/account_cache_test.go

@@ -55,7 +55,6 @@ func TestWatchNewFile(t *testing.T) {
  t.Parallel()
 
  dir, ks := tmpKeyStore(t, false)
- defer os.RemoveAll(dir)
 
  // Ensure the watcher is started before adding any files.
  ks.Accounts()

accounts/keystore/keystore_test.go

@@ -17,7 +17,6 @@
 package keystore
 
 import (
- "io/ioutil"
  "math/rand"
  "os"
  "runtime"
@@ -38,7 +37,6 @@ var testSigData = make([]byte, 32)
 
 func TestKeyStore(t *testing.T) {
  dir, ks := tmpKeyStore(t, true)
- defer os.RemoveAll(dir)
 
  a, err := ks.NewAccount("foo")
  if err != nil {
@@ -72,8 +70,7 @@ func TestKeyStore(t *testing.T) {
 }
 
 func TestSign(t *testing.T) {
- dir, ks := tmpKeyStore(t, true)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStore(t, true)
 
  pass := "" // not used but required by API
  a1, err := ks.NewAccount(pass)
@@ -89,8 +86,7 @@ func TestSign(t *testing.T) {
 }
 
 func TestSignWithPassphrase(t *testing.T) {
- dir, ks := tmpKeyStore(t, true)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStore(t, true)
 
  pass := "passwd"
  acc, err := ks.NewAccount(pass)
@@ -117,8 +113,7 @@ func TestSignWithPassphrase(t *testing.T) {
 }
 
 func TestTimedUnlock(t *testing.T) {
- dir, ks := tmpKeyStore(t, true)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStore(t, true)
 
  pass := "foo"
  a1, err := ks.NewAccount(pass)
@@ -152,8 +147,7 @@ func TestTimedUnlock(t *testing.T) {
 }
 
 func TestOverrideUnlock(t *testing.T) {
- dir, ks := tmpKeyStore(t, false)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStore(t, false)
 
  pass := "foo"
  a1, err := ks.NewAccount(pass)
@@ -193,8 +187,7 @@ func TestOverrideUnlock(t *testing.T) {
 
 // This test should fail under -race if signing races the expiration goroutine.
 func TestSignRace(t *testing.T) {
- dir, ks := tmpKeyStore(t, false)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStore(t, false)
 
  // Create a test account.
  a1, err := ks.NewAccount("")
@@ -222,8 +215,7 @@ func TestSignRace(t *testing.T) {
 // addition and removal of wallet event subscriptions.
 func TestWalletNotifierLifecycle(t *testing.T) {
  // Create a temporary kesytore to test with
- dir, ks := tmpKeyStore(t, false)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStore(t, false)
 
  // Ensure that the notification updater is not running yet
  time.Sleep(250 * time.Millisecond)
@@ -283,8 +275,7 @@ type walletEvent struct {
 // Tests that wallet notifications and correctly fired when accounts are added
 // or deleted from the keystore.
 func TestWalletNotifications(t *testing.T) {
- dir, ks := tmpKeyStore(t, false)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStore(t, false)
 
  // Subscribe to the wallet feed and collect events.
  var (
@@ -345,8 +336,7 @@ func TestWalletNotifications(t *testing.T) {
 
 // TestImportExport tests the import functionality of a keystore.
 func TestImportECDSA(t *testing.T) {
- dir, ks := tmpKeyStore(t, true)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStore(t, true)
  key, err := crypto.GenerateKey()
  if err != nil {
  t.Fatalf("failed to generate key: %v", key)
@@ -364,8 +354,7 @@ func TestImportECDSA(t *testing.T) {
 
 // TestImportECDSA tests the import and export functionality of a keystore.
 func TestImportExport(t *testing.T) {
- dir, ks := tmpKeyStore(t, true)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStore(t, true)
  acc, err := ks.NewAccount("old")
  if err != nil {
  t.Fatalf("failed to create account: %v", acc)
@@ -374,8 +363,7 @@ func TestImportExport(t *testing.T) {
  if err != nil {
  t.Fatalf("failed to export account: %v", acc)
  }
- dir2, ks2 := tmpKeyStore(t, true)
- defer os.RemoveAll(dir2)
+ _, ks2 := tmpKeyStore(t, true)
  if _, err = ks2.Import(json, "old", "old"); err == nil {
  t.Errorf("importing with invalid password succeeded")
  }
@@ -395,8 +383,7 @@ func TestImportExport(t *testing.T) {
 // TestImportRace tests the keystore on races.
 // This test should fail under -race if importing races.
 func TestImportRace(t *testing.T) {
- dir, ks := tmpKeyStore(t, true)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStore(t, true)
  acc, err := ks.NewAccount("old")
  if err != nil {
  t.Fatalf("failed to create account: %v", acc)
@@ -405,8 +392,7 @@ func TestImportRace(t *testing.T) {
  if err != nil {
  t.Fatalf("failed to export account: %v", acc)
  }
- dir2, ks2 := tmpKeyStore(t, true)
- defer os.RemoveAll(dir2)
+ _, ks2 := tmpKeyStore(t, true)
  var atom uint32
  var wg sync.WaitGroup
  wg.Add(2)
@@ -462,10 +448,7 @@ func checkEvents(t *testing.T, want []walletEvent, have []walletEvent) {
 }
 
 func tmpKeyStore(t *testing.T, encrypted bool) (string, *KeyStore) {
- d, err := ioutil.TempDir("", "eth-keystore-test")
- if err != nil {
- t.Fatal(err)
- }
+ d := t.TempDir()
  newKs := NewPlaintextKeyStore
  if encrypted {
  newKs = func(kd string) *KeyStore { return NewKeyStore(kd, veryLightScryptN, veryLightScryptP) }

accounts/keystore/plain_test.go

@@ -20,8 +20,6 @@ import (
  "crypto/rand"
  "encoding/hex"
  "fmt"
- "io/ioutil"
- "os"
  "path/filepath"
  "reflect"
  "strings"
@@ -32,10 +30,7 @@ import (
 )
 
 func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) {
- d, err := ioutil.TempDir("", "geth-keystore-test")
- if err != nil {
- t.Fatal(err)
- }
+ d := t.TempDir()
  if encrypted {
  ks = &keyStorePassphrase{d, veryLightScryptN, veryLightScryptP, true}
  } else {
@@ -45,8 +40,7 @@ func tmpKeyStoreIface(t *testing.T, encrypted bool) (dir string, ks keyStore) {
 }
 
 func TestKeyStorePlain(t *testing.T) {
- dir, ks := tmpKeyStoreIface(t, false)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStoreIface(t, false)
 
  pass := "" // not used but required by API
  k1, account, err := storeNewKey(ks, rand.Reader, pass)
@@ -66,8 +60,7 @@ func TestKeyStorePlain(t *testing.T) {
 }
 
 func TestKeyStorePassphrase(t *testing.T) {
- dir, ks := tmpKeyStoreIface(t, true)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStoreIface(t, true)
 
  pass := "foo"
  k1, account, err := storeNewKey(ks, rand.Reader, pass)
@@ -87,8 +80,7 @@ func TestKeyStorePassphrase(t *testing.T) {
 }
 
 func TestKeyStorePassphraseDecryptionFail(t *testing.T) {
- dir, ks := tmpKeyStoreIface(t, true)
- defer os.RemoveAll(dir)
+ _, ks := tmpKeyStoreIface(t, true)
 
  pass := "foo"
  k1, account, err := storeNewKey(ks, rand.Reader, pass)
@@ -102,7 +94,6 @@ func TestKeyStorePassphraseDecryptionFail(t *testing.T) {
 
 func TestImportPreSaleKey(t *testing.T) {
  dir, ks := tmpKeyStoreIface(t, true)
- defer os.RemoveAll(dir)
 
  // file content of a presale key file generated with:
  // python pyethsaletool.py genwallet

cmd/ethkey/message_test.go

@@ -17,18 +17,12 @@
 package main
 
 import (
- "io/ioutil"
- "os"
  "path/filepath"
  "testing"
 )
 
 func TestMessageSignVerify(t *testing.T) {
- tmpdir, err := ioutil.TempDir("", "ethkey-test")
- if err != nil {
- t.Fatal("Can't create temporary directory:", err)
- }
- defer os.RemoveAll(tmpdir)
+ tmpdir := t.TempDir()
 
  keyfile := filepath.Join(tmpdir, "the-keyfile")
  message := "test message"

cmd/geth/accountcmd_test.go

@@ -33,7 +33,7 @@ import (
 // are copied into a temporary keystore directory.
 
 func tmpDatadirWithKeystore(t *testing.T) string {
- datadir := tmpdir(t)
+ datadir := t.TempDir()
  keystore := filepath.Join(datadir, "keystore")
  source := filepath.Join("..", "..", "accounts", "keystore", "testdata", "keystore")
  if err := cp.CopyAll(keystore, source); err != nil {
@@ -111,7 +111,7 @@ func TestAccountImport(t *testing.T) {
 }
 
 func importAccountWithExpect(t *testing.T, key string, expected string) {
- dir := tmpdir(t)
+ dir := t.TempDir()
  keyfile := filepath.Join(dir, "key.prv")
  if err := ioutil.WriteFile(keyfile, []byte(key), 0600); err != nil {
  t.Error(err)

cmd/geth/consolecmd_test.go

@@ -19,7 +19,6 @@ package main
 import (
  "crypto/rand"
  "math/big"
- "os"
  "path/filepath"
  "runtime"
  "strconv"
@@ -92,9 +91,7 @@ func TestAttachWelcome(t *testing.T) {
  if runtime.GOOS == "windows" {
  ipc = `\\.\pipe\geth` + strconv.Itoa(trulyRandInt(100000, 999999))
  } else {
- ws := tmpdir(t)
- defer os.RemoveAll(ws)
- ipc = filepath.Join(ws, "geth.ipc")
+ ipc = filepath.Join(t.TempDir(), "geth.ipc")
  }
  // And HTTP + WS attachment
  p := trulyRandInt(1024, 65533) // Yeah, sometimes this will fail, sorry :P
@@ -118,6 +115,7 @@ func TestAttachWelcome(t *testing.T) {
  waitForEndpoint(t, endpoint, 3*time.Second)
  testAttachWelcome(t, geth, endpoint, httpAPIs)
  })
+ geth.ExpectExit()
 }
 
 func testAttachWelcome(t *testing.T, geth *testgeth, endpoint, apis string) {

cmd/geth/dao_test.go

@@ -19,7 +19,6 @@ package main
 import (
  "io/ioutil"
  "math/big"
- "os"
  "path/filepath"
  "testing"
 
@@ -106,8 +105,7 @@ func TestDAOForkBlockNewChain(t *testing.T) {
 
 func testDAOForkBlockNewChain(t *testing.T, test int, genesis string, expectBlock *big.Int, expectVote bool) {
  // Create a temporary data directory to use and inspect later
- datadir := tmpdir(t)
- defer os.RemoveAll(datadir)
+ datadir := t.TempDir()
 
  // Start a Geth instance with the requested flags set and immediately terminate
  if genesis != "" {

cmd/geth/genesis_test.go

@@ -18,7 +18,6 @@ package main
 
 import (
  "io/ioutil"
- "os"
  "path/filepath"
  "testing"
 )
@@ -73,8 +72,7 @@ var customGenesisTests = []struct {
 func TestCustomGenesis(t *testing.T) {
  for i, tt := range customGenesisTests {
  // Create a temporary data directory to use and inspect later
- datadir := tmpdir(t)
- defer os.RemoveAll(datadir)
+ datadir := t.TempDir()
 
  // Initialize the data directory with the custom genesis block
  json := filepath.Join(datadir, "genesis.json")

cmd/geth/run_test.go

@@ -19,7 +19,6 @@ package main
 import (
  "context"
  "fmt"
- "io/ioutil"
  "os"
  "testing"
  "time"
@@ -29,14 +28,6 @@ import (
  "github.com/ethereum/go-ethereum/rpc"
 )
 
-func tmpdir(t *testing.T) string {
- dir, err := ioutil.TempDir("", "geth-test")
- if err != nil {
- t.Fatal(err)
- }
- return dir
-}
-
 type testgeth struct {
  *cmdtest.TestCmd
 
@@ -82,15 +73,10 @@ func runGeth(t *testing.T, args ...string) *testgeth {
  }
  }
  if tt.Datadir == "" {
- tt.Datadir = tmpdir(t)
- tt.Cleanup = func() { os.RemoveAll(tt.Datadir) }
+ // The temporary datadir will be removed automatically if something fails below.
+ tt.Datadir = t.TempDir()
+ tt.Cleanup = func() {}
  args = append([]string{"--datadir", tt.Datadir}, args...)
- // Remove the temporary datadir if something fails below.
- defer func() {
- if t.Failed() {
- tt.Cleanup()
- }
- }()
  }
 
  // Boot "geth". This actually runs the test binary but the TestMain

consensus/ethash/algorithm_test.go

@@ -698,6 +698,8 @@ func TestHashimoto(t *testing.T) {
 // Tests that caches generated on disk may be done concurrently.
 func TestConcurrentDiskCacheGeneration(t *testing.T) {
  // Create a temp folder to generate the caches into
+ // TODO: t.TempDir fails to remove the directory on Windows
+ // \AppData\Local\Temp\1\TestConcurrentDiskCacheGeneration2382060137\001\cache-R23-1dca8a85e74aa763: Access is denied.
  cachedir, err := ioutil.TempDir("", "")
  if err != nil {
  t.Fatalf("Failed to create temporary cache dir: %v", err)
@@ -794,11 +796,7 @@ func BenchmarkHashimotoFullSmall(b *testing.B) {
 
 func benchmarkHashimotoFullMmap(b *testing.B, name string, lock bool) {
  b.Run(name, func(b *testing.B) {
- tmpdir, err := ioutil.TempDir("", "ethash-test")
- if err != nil {
- b.Fatal(err)
- }
- defer os.RemoveAll(tmpdir)
+ tmpdir := b.TempDir()
 
  d := &dataset{epoch: 0}
  d.generate(tmpdir, 1, lock, false)