all: rollback more

AdguardTeam · Mar 10, 2021 · c1645e2 · c1645e2
1 parent 989811b
commit c1645e2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/internal/querylog/qlog_test.go b/internal/querylog/qlog_test.go
@@ -8,10 +8,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/AdguardTeam/dnsproxy/proxyutil"
-
 	"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
 	"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
+	"github.com/AdguardTeam/dnsproxy/proxyutil"
 	"github.com/miekg/dns"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -29,7 +28,7 @@ func TestQueryLog(t *testing.T) {
 		FileEnabled: true,
 		Interval:    1,
 		MemSize:     100,
-		BaseDir:     t.TempDir(),
+		BaseDir:     aghtest.PrepareTestDir(t),
 	})
 
 	// Add disk entries.
@@ -131,7 +130,7 @@ func TestQueryLogOffsetLimit(t *testing.T) {
 		Enabled:  true,
 		Interval: 1,
 		MemSize:  100,
-		BaseDir:  t.TempDir(),
+		BaseDir:  aghtest.PrepareTestDir(t),
 	})
 
 	const (
@@ -205,7 +204,7 @@ func TestQueryLogMaxFileScanEntries(t *testing.T) {
 		FileEnabled: true,
 		Interval:    1,
 		MemSize:     100,
-		BaseDir:     t.TempDir(),
+		BaseDir:     aghtest.PrepareTestDir(t),
 	})
 
 	const entNum = 10
@@ -233,7 +232,7 @@ func TestQueryLogFileDisabled(t *testing.T) {
 		FileEnabled: false,
 		Interval:    1,
 		MemSize:     2,
-		BaseDir:     t.TempDir(),
+		BaseDir:     aghtest.PrepareTestDir(t),
 	})
 
 	addEntry(l, "example1.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))

diff --git a/internal/querylog/qlogfile_test.go b/internal/querylog/qlogfile_test.go
@@ -12,6 +12,7 @@ import (
 	"testing"
 	"time"
 
+	"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -35,7 +36,7 @@ func prepareTestFiles(t *testing.T, filesNum, linesNum int) []string {
 	lineTime, _ := time.Parse(time.RFC3339Nano, "2020-02-18T22:36:35.920973+03:00")
 	lineIP := uint32(0)
 
-	dir := t.TempDir()
+	dir := aghtest.PrepareTestDir(t)
 
 	files := make([]string, filesNum)
 	for j := range files {
@@ -281,7 +282,7 @@ func TestQLogFile(t *testing.T) {
 }
 
 func NewTestQLogFileData(t *testing.T, data string) (file *QLogFile) {
-	f, err := ioutil.TempFile(t.TempDir(), "*.txt")
+	f, err := ioutil.TempFile(aghtest.PrepareTestDir(t), "*.txt")
 	require.Nil(t, err)
 	t.Cleanup(func() {
 		assert.Nil(t, f.Close())

diff --git a/internal/updater/updater_test.go b/internal/updater/updater_test.go
@@ -100,7 +100,7 @@ func TestUpdateGetVersion(t *testing.T) {
 }
 
 func TestUpdate(t *testing.T) {
-	wd := t.TempDir()
+	wd := aghtest.PrepareTestDir(t)
 
 	assert.Nil(t, ioutil.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
 	assert.Nil(t, ioutil.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
@@ -166,7 +166,7 @@ func TestUpdate(t *testing.T) {
 }
 
 func TestUpdateWindows(t *testing.T) {
-	wd := t.TempDir()
+	wd := aghtest.PrepareTestDir(t)
 
 	assert.Nil(t, ioutil.WriteFile(filepath.Join(wd, "AdGuardHome.exe"), []byte("AdGuardHome.exe"), 0o755))
 	assert.Nil(t, ioutil.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))

diff --git a/internal/util/autohosts_test.go b/internal/util/autohosts_test.go
@@ -21,7 +21,7 @@ func TestMain(m *testing.M) {
 func prepareTestFile(t *testing.T) (f *os.File) {
 	t.Helper()
 
-	dir := t.TempDir()
+	dir := aghtest.PrepareTestDir(t)
 
 	f, err := ioutil.TempFile(dir, "")
 	require.Nil(t, err)