3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-04-29 10:26:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

test: use T.TempDir to create temporary test directory (#3725)

Browse source 
Prior to this commit, temporary directories in tests were created using
`filepath.Join` and `os.MkdirAll`.

This commit replaces `os.MkdirAll` with `t.TempDir` in tests. The
directory created by `t.TempDir` is automatically removed when the test
and all its subtests complete.

Reference: https://pkg.go.dev/testing#T.TempDir
Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
This commit is contained in:
Eng Zer Jun 2022-11-09 00:16:32 +08:00 • committed by GitHub
parent e1f881f82b
commit 45ce6f693a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
config/config_source_test.go
View file

@ -8,20 +8,15 @@ import (
"testing"
"time"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
)
func TestFileWatcherSource(t *testing.T) {
ctx := context.Background()
tmpdir := filepath.Join(os.TempDir(), uuid.New().String())
err := os.MkdirAll(tmpdir, 0o755)
if !assert.NoError(t, err) {
return
}
tmpdir := t.TempDir()
err = os.WriteFile(filepath.Join(tmpdir, "example.txt"), []byte{1, 2, 3, 4}, 0o600)
err := os.WriteFile(filepath.Join(tmpdir, "example.txt"), []byte{1, 2, 3, 4}, 0o600)
if !assert.NoError(t, err) {
return
}

10
config/envoyconfig/filemgr/filemgr_test.go
View file

@ -6,19 +6,11 @@ import (
"testing"
envoy_config_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
)
func Test(t *testing.T) {
dir := filepath.Join(os.TempDir(), uuid.New().String())
err := os.MkdirAll(dir, 0o755)
if !assert.NoError(t, err) {
return
}
defer func() {
_ = os.RemoveAll(dir)
}()
dir := t.TempDir()
t.Run("bytes", func(t *testing.T) {
mgr := NewManager(WithCacheDir(dir))

8
databroker/cache_test.go
View file

@ -1,8 +1,6 @@
package databroker
import (
"log"
"os"
"testing"
"github.com/pomerium/pomerium/config"
@ -11,12 +9,6 @@ import (
)
func TestNew(t *testing.T) {
dir, err := os.MkdirTemp("", "example")
if err != nil {
log.Fatal(err)
}
defer os.RemoveAll(dir)
tests := []struct {
name string
opts config.Options

6
internal/autocert/manager_test.go
View file

@ -18,7 +18,6 @@ import (
"net/http"
"net/http/httptest"
"os"
"path/filepath"
"testing"
"time"
@ -27,7 +26,6 @@ import (
"github.com/go-chi/chi/v5/middleware"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/google/uuid"
"github.com/mholt/acmez/acme"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@ -217,9 +215,7 @@ func TestConfig(t *testing.T) {
mockACME = newMockACME(ca, srv)
tmpdir := filepath.Join(os.TempDir(), uuid.New().String())
_ = os.MkdirAll(tmpdir, 0o755)
defer os.RemoveAll(tmpdir)
tmpdir := t.TempDir()
li, err := net.Listen("tcp", "127.0.0.1:0")
if !assert.NoError(t, err) {

18
internal/fileutil/watcher_test.go
View file

@ -6,18 +6,13 @@ import (
"testing"
"time"
"github.com/google/uuid"
"github.com/stretchr/testify/assert"
)
func TestWatcher(t *testing.T) {
tmpdir := filepath.Join(os.TempDir(), uuid.New().String())
err := os.MkdirAll(tmpdir, 0o755)
if !assert.NoError(t, err) {
return
}
tmpdir := t.TempDir()
err = os.WriteFile(filepath.Join(tmpdir, "test1.txt"), []byte{1, 2, 3, 4}, 0o666)
err := os.WriteFile(filepath.Join(tmpdir, "test1.txt"), []byte{1, 2, 3, 4}, 0o666)
if !assert.NoError(t, err) {
return
}
@ -44,14 +39,9 @@ func TestWatcher(t *testing.T) {
func TestWatcherSymlink(t *testing.T) {
t.Parallel()
tmpdir := filepath.Join(os.TempDir(), uuid.New().String())
err := os.MkdirAll(tmpdir, 0o755)
if !assert.NoError(t, err) {
return
}
t.Cleanup(func() { os.RemoveAll(tmpdir) })
tmpdir := t.TempDir()
err = os.WriteFile(filepath.Join(tmpdir, "test1.txt"), []byte{1, 2, 3, 4}, 0o666)
err := os.WriteFile(filepath.Join(tmpdir, "test1.txt"), []byte{1, 2, 3, 4}, 0o666)
if !assert.NoError(t, err) {
return
}