From 138dfaa85b8eddb9caeabd6856e830783b2c189d Mon Sep 17 00:00:00 2001
From: Ainar Garipov <a.garipov@adguard.com>
Date: Thu, 22 Apr 2021 14:18:20 +0300
Subject: [PATCH] Pull request: home: rm unnecessary func

Merge in DNS/adguard-home from imp-test to master

Squashed commit of the following:

commit 0ef7812e32b74647b43bb1d69b569e9b102e92b3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Apr 22 14:12:00 2021 +0300

    home: rm unnecessary func
---
 internal/home/auth_test.go       | 20 ++------------------
 internal/home/authglinet_test.go |  2 +-
 internal/home/filter_test.go     |  2 +-
 internal/home/home_test.go       |  2 +-
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/internal/home/auth_test.go b/internal/home/auth_test.go
index 48e190a3..04212450 100644
--- a/internal/home/auth_test.go
+++ b/internal/home/auth_test.go
@@ -8,7 +8,6 @@ import (
 	"net/http"
 	"net/textproto"
 	"net/url"
-	"os"
 	"path/filepath"
 	"testing"
 	"time"
@@ -22,21 +21,6 @@ func TestMain(m *testing.M) {
 	aghtest.DiscardLogOutput(m)
 }
 
-func prepareTestDir(t *testing.T) string {
-	t.Helper()
-
-	const dir = "./agh-test"
-
-	require.Nil(t, os.RemoveAll(dir))
-	// TODO(e.burkov): Replace with testing.TempDir after updating Go
-	// version to 1.16.
-	require.Nil(t, os.MkdirAll(dir, 0o755))
-
-	t.Cleanup(func() { require.Nil(t, os.RemoveAll(dir)) })
-
-	return dir
-}
-
 func TestNewSessionToken(t *testing.T) {
 	// Successful case.
 	token, err := newSessionToken()
@@ -57,7 +41,7 @@ func TestNewSessionToken(t *testing.T) {
 }
 
 func TestAuth(t *testing.T) {
-	dir := prepareTestDir(t)
+	dir := t.TempDir()
 	fn := filepath.Join(dir, "sessions.db")
 
 	users := []User{{
@@ -132,7 +116,7 @@ func (w *testResponseWriter) WriteHeader(statusCode int) {
 }
 
 func TestAuthHTTP(t *testing.T) {
-	dir := prepareTestDir(t)
+	dir := t.TempDir()
 	fn := filepath.Join(dir, "sessions.db")
 
 	users := []User{
diff --git a/internal/home/authglinet_test.go b/internal/home/authglinet_test.go
index e3a71be4..26c36711 100644
--- a/internal/home/authglinet_test.go
+++ b/internal/home/authglinet_test.go
@@ -12,7 +12,7 @@ import (
 )
 
 func TestAuthGL(t *testing.T) {
-	dir := prepareTestDir(t)
+	dir := t.TempDir()
 
 	GLMode = true
 	t.Cleanup(func() {
diff --git a/internal/home/filter_test.go b/internal/home/filter_test.go
index dc4b295c..21156474 100644
--- a/internal/home/filter_test.go
+++ b/internal/home/filter_test.go
@@ -43,7 +43,7 @@ func testStartFilterListener(t *testing.T) net.Listener {
 
 func TestFilters(t *testing.T) {
 	l := testStartFilterListener(t)
-	dir := prepareTestDir(t)
+	dir := t.TempDir()
 
 	Context = homeContext{
 		workDir: dir,
diff --git a/internal/home/home_test.go b/internal/home/home_test.go
index 3610097b..e67de013 100644
--- a/internal/home/home_test.go
+++ b/internal/home/home_test.go
@@ -114,7 +114,7 @@ func TestHome(t *testing.T) {
 	// Init new context
 	Context = homeContext{}
 
-	dir := prepareTestDir(t)
+	dir := t.TempDir()
 	fn := filepath.Join(dir, "AdGuardHome.yaml")
 
 	// Prepare the test config