Skip to content

Commit dbc4869

Browse files
refactor: use t.TempDir() instead of os.MkdirTemp
Signed-off-by: yuhangcangqian <[email protected]>
1 parent 066cbd6 commit dbc4869

File tree

2 files changed

+9
-27
lines changed

2 files changed

+9
-27
lines changed

internal/api/lib_test.go

+8-24
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ const (
2929
var TESTING_CAPABILITIES = []string{"staking", "stargate", "iterator", "cosmwasm_1_1", "cosmwasm_1_2", "cosmwasm_1_3"}
3030

3131
func TestInitAndReleaseCache(t *testing.T) {
32-
tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
33-
require.NoError(t, err)
34-
defer os.RemoveAll(tmpdir)
32+
tmpdir := t.TempDir()
3533

3634
config := types.VMConfig{
3735
Cache: types.CacheOptions{
@@ -49,9 +47,7 @@ func TestInitAndReleaseCache(t *testing.T) {
4947
// wasmd expects us to create the base directory
5048
// https://github.com/CosmWasm/wasmd/blob/v0.30.0/x/wasm/keeper/keeper.go#L128
5149
func TestInitCacheWorksForNonExistentDir(t *testing.T) {
52-
tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
53-
require.NoError(t, err)
54-
defer os.RemoveAll(tmpdir)
50+
tmpdir := t.TempDir()
5551

5652
createMe := filepath.Join(tmpdir, "does-not-yet-exist")
5753
config := types.VMConfig{
@@ -85,9 +81,7 @@ func TestInitCacheErrorsForBrokenDir(t *testing.T) {
8581
}
8682

8783
func TestInitLockingPreventsConcurrentAccess(t *testing.T) {
88-
tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
89-
require.NoError(t, err)
90-
defer os.RemoveAll(tmpdir)
84+
tmpdir := t.TempDir()
9185

9286
config1 := types.VMConfig{
9387
Cache: types.CacheOptions{
@@ -128,15 +122,9 @@ func TestInitLockingPreventsConcurrentAccess(t *testing.T) {
128122
}
129123

130124
func TestInitLockingAllowsMultipleInstancesInDifferentDirs(t *testing.T) {
131-
tmpdir1, err := os.MkdirTemp("", "wasmvm-testing1")
132-
require.NoError(t, err)
133-
tmpdir2, err := os.MkdirTemp("", "wasmvm-testing2")
134-
require.NoError(t, err)
135-
tmpdir3, err := os.MkdirTemp("", "wasmvm-testing3")
136-
require.NoError(t, err)
137-
defer os.RemoveAll(tmpdir1)
138-
defer os.RemoveAll(tmpdir2)
139-
defer os.RemoveAll(tmpdir3)
125+
tmpdir1 := t.TempDir()
126+
tmpdir2 := t.TempDir()
127+
tmpdir3 := t.TempDir()
140128

141129
config1 := types.VMConfig{
142130
Cache: types.CacheOptions{
@@ -175,9 +163,7 @@ func TestInitLockingAllowsMultipleInstancesInDifferentDirs(t *testing.T) {
175163
}
176164

177165
func TestInitCacheEmptyCapabilities(t *testing.T) {
178-
tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
179-
require.NoError(t, err)
180-
defer os.RemoveAll(tmpdir)
166+
tmpdir := t.TempDir()
181167
config := types.VMConfig{
182168
Cache: types.CacheOptions{
183169
BaseDir: tmpdir,
@@ -193,8 +179,7 @@ func TestInitCacheEmptyCapabilities(t *testing.T) {
193179

194180
func withCache(tb testing.TB) (Cache, func()) {
195181
tb.Helper()
196-
tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
197-
require.NoError(tb, err)
182+
tmpdir := tb.TempDir()
198183
config := types.VMConfig{
199184
Cache: types.CacheOptions{
200185
BaseDir: tmpdir,
@@ -207,7 +192,6 @@ func withCache(tb testing.TB) (Cache, func()) {
207192
require.NoError(tb, err)
208193

209194
cleanup := func() {
210-
os.RemoveAll(tmpdir)
211195
ReleaseCache(cache)
212196
}
213197
return cache, cleanup

lib_libwasmvm_test.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@ const (
3232

3333
func withVM(t *testing.T) *VM {
3434
t.Helper()
35-
tmpdir, err := os.MkdirTemp("", "wasmvm-testing")
36-
require.NoError(t, err)
35+
tmpdir := t.TempDir()
3736
vm, err := NewVM(tmpdir, TESTING_CAPABILITIES, TESTING_MEMORY_LIMIT, TESTING_PRINT_DEBUG, TESTING_CACHE_SIZE)
3837
require.NoError(t, err)
3938

4039
t.Cleanup(func() {
4140
vm.Cleanup()
42-
os.RemoveAll(tmpdir)
4341
})
4442
return vm
4543
}

0 commit comments

Comments
 (0)