diff --git a/CHANGELOG.md b/CHANGELOG.md index 63909d436b8..393a5e59ede 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,10 @@ and this project adheres to - This changelog :-) (#2294). - `HACKING.md`, a guide for developers. +### Changed + +- Improved tests output (#2273). + ### Fixed -- Infinite loop in `/dhcp/find_active_dhcp` (#2301). +- Infinite loop in `/dhcp/find_active_dhcp` (#2301). \ No newline at end of file diff --git a/internal/agherr/agherr_test.go b/internal/agherr/agherr_test.go index 21e3af79968..3940bdee581 100644 --- a/internal/agherr/agherr_test.go +++ b/internal/agherr/agherr_test.go @@ -5,9 +5,14 @@ import ( "fmt" "testing" + "github.com/AdguardTeam/AdGuardHome/internal/testutil" "github.com/stretchr/testify/assert" ) +func TestMain(m *testing.M) { + testutil.DiscardLogOutput(m) +} + func TestError_Error(t *testing.T) { testCases := []struct { name string diff --git a/internal/dhcpd/dhcpd_test.go b/internal/dhcpd/dhcpd_test.go index c57ff36b113..58b88bda68f 100644 --- a/internal/dhcpd/dhcpd_test.go +++ b/internal/dhcpd/dhcpd_test.go @@ -9,9 +9,14 @@ import ( "testing" "time" + "github.com/AdguardTeam/AdGuardHome/internal/testutil" "github.com/stretchr/testify/assert" ) +func TestMain(m *testing.M) { + testutil.DiscardLogOutput(m) +} + func testNotify(flags uint32) { } diff --git a/internal/dhcpd/nclient4/client_test.go b/internal/dhcpd/nclient4/client_test.go index 79501b28acb..353a9ed7ab0 100644 --- a/internal/dhcpd/nclient4/client_test.go +++ b/internal/dhcpd/nclient4/client_test.go @@ -17,11 +17,16 @@ import ( "testing" "time" + "github.com/AdguardTeam/AdGuardHome/internal/testutil" "github.com/hugelgupf/socketpair" "github.com/insomniacslk/dhcp/dhcpv4" "github.com/insomniacslk/dhcp/dhcpv4/server4" ) +func TestMain(m *testing.M) { + testutil.DiscardLogOutput(m) +} + type handler struct { mu sync.Mutex received []*dhcpv4.DHCPv4 diff --git a/internal/dnsfilter/dnsfilter_test.go b/internal/dnsfilter/dnsfilter_test.go index f431a1e4779..357e24c49ad 100644 --- a/internal/dnsfilter/dnsfilter_test.go +++ b/internal/dnsfilter/dnsfilter_test.go @@ -5,11 +5,16 @@ import ( "net" "testing" + "github.com/AdguardTeam/AdGuardHome/internal/testutil" "github.com/AdguardTeam/urlfilter/rules" "github.com/miekg/dns" "github.com/stretchr/testify/assert" ) +func TestMain(m *testing.M) { + testutil.DiscardLogOutput(m) +} + var setts RequestFilteringSettings // HELPERS @@ -290,7 +295,6 @@ func TestSafeSearchCacheGoogle(t *testing.T) { t.Fatalf("Failed to lookup for %s", safeDomain) } - t.Logf("IP addresses: %v", ips) ip := ips[0] for _, i := range ips { if i.To4() != nil { diff --git a/internal/dnsforward/dnsforward_test.go b/internal/dnsforward/dnsforward_test.go index 55a56d9ae1a..ab2d1b720e2 100644 --- a/internal/dnsforward/dnsforward_test.go +++ b/internal/dnsforward/dnsforward_test.go @@ -18,6 +18,7 @@ import ( "testing" "time" + "github.com/AdguardTeam/AdGuardHome/internal/testutil" "github.com/AdguardTeam/AdGuardHome/internal/util" "github.com/AdguardTeam/AdGuardHome/internal/dhcpd" @@ -28,6 +29,10 @@ import ( "github.com/stretchr/testify/assert" ) +func TestMain(m *testing.M) { + testutil.DiscardLogOutput(m) +} + const ( tlsServerName = "testdns.adguard.com" testMessagesCount = 10 diff --git a/internal/home/auth_test.go b/internal/home/auth_test.go index a4829b93279..dd2b68b36b5 100644 --- a/internal/home/auth_test.go +++ b/internal/home/auth_test.go @@ -9,9 +9,14 @@ import ( "testing" "time" + "github.com/AdguardTeam/AdGuardHome/internal/testutil" "github.com/stretchr/testify/assert" ) +func TestMain(m *testing.M) { + testutil.DiscardLogOutput(m) +} + func prepareTestDir() string { const dir = "./agh-test" _ = os.RemoveAll(dir) @@ -85,9 +90,11 @@ type testResponseWriter struct { func (w *testResponseWriter) Header() http.Header { return w.hdr } + func (w *testResponseWriter) Write([]byte) (int, error) { return 0, nil } + func (w *testResponseWriter) WriteHeader(statusCode int) { w.statusCode = statusCode } diff --git a/internal/home/home_test.go b/internal/home/home_test.go index c78aee52d41..3a4db3975f8 100644 --- a/internal/home/home_test.go +++ b/internal/home/home_test.go @@ -1,5 +1,7 @@ // +build !race +// TODO(e.burkov): remove this weird buildtag. + package home import ( diff --git a/internal/querylog/qlog_test.go b/internal/querylog/qlog_test.go index 078d39fe3b2..35f33b99a86 100644 --- a/internal/querylog/qlog_test.go +++ b/internal/querylog/qlog_test.go @@ -8,10 +8,15 @@ import ( "github.com/AdguardTeam/dnsproxy/proxyutil" "github.com/AdguardTeam/AdGuardHome/internal/dnsfilter" + "github.com/AdguardTeam/AdGuardHome/internal/testutil" "github.com/miekg/dns" "github.com/stretchr/testify/assert" ) +func TestMain(m *testing.M) { + testutil.DiscardLogOutput(m) +} + func prepareTestDir() string { const dir = "./agh-test" _ = os.RemoveAll(dir) diff --git a/internal/stats/stats_test.go b/internal/stats/stats_test.go index 21e728f3a86..3a4bed66b7f 100644 --- a/internal/stats/stats_test.go +++ b/internal/stats/stats_test.go @@ -7,9 +7,14 @@ import ( "sync/atomic" "testing" + "github.com/AdguardTeam/AdGuardHome/internal/testutil" "github.com/stretchr/testify/assert" ) +func TestMain(m *testing.M) { + testutil.DiscardLogOutput(m) +} + func UIntArrayEquals(a, b []uint64) bool { if len(a) != len(b) { return false diff --git a/internal/testutil/testutil.go b/internal/testutil/testutil.go new file mode 100644 index 00000000000..f51062652a4 --- /dev/null +++ b/internal/testutil/testutil.go @@ -0,0 +1,19 @@ +// Package testutil contains utilities for testing. +package testutil + +import ( + "io/ioutil" + "os" + "testing" + + "github.com/AdguardTeam/golibs/log" +) + +// DiscardLogOutput runs tests with discarded logger output. +func DiscardLogOutput(m *testing.M) { + // TODO(e.burkov): Refactor code and tests to not use the global mutable + // logger. + log.SetOutput(ioutil.Discard) + + os.Exit(m.Run()) +} diff --git a/internal/update/update_test.go b/internal/update/update_test.go index 44013960548..5616104ab58 100644 --- a/internal/update/update_test.go +++ b/internal/update/update_test.go @@ -8,9 +8,14 @@ import ( "os" "testing" + "github.com/AdguardTeam/AdGuardHome/internal/testutil" "github.com/stretchr/testify/assert" ) +func TestMain(m *testing.M) { + testutil.DiscardLogOutput(m) +} + func startHTTPServer(data string) (net.Listener, uint16) { mux := http.NewServeMux() mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) { diff --git a/internal/util/auto_hosts_test.go b/internal/util/auto_hosts_test.go index 9084daba9b8..04911142eb5 100644 --- a/internal/util/auto_hosts_test.go +++ b/internal/util/auto_hosts_test.go @@ -8,10 +8,15 @@ import ( "testing" "time" + "github.com/AdguardTeam/AdGuardHome/internal/testutil" "github.com/miekg/dns" "github.com/stretchr/testify/assert" ) +func TestMain(m *testing.M) { + testutil.DiscardLogOutput(m) +} + func prepareTestDir() string { const dir = "./agh-test" _ = os.RemoveAll(dir)