a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pull request: all: imp errcheck in tests 

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

Squashed commit of the following:

commit ed046b8ef59a092a27c623cd14b3fc2ef305fc3d
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 4 15:00:04 2021 +0300

    stats: imp cleanup more

commit e53a9240d3e3eec2417c768b98c267a8cd54d992
Merge: da734317 676f8c76
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 4 14:59:40 2021 +0300

    Merge branch 'master' into imp-errcheck

commit da734317035543b52e5a9030813084bdc92ba90a
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 4 14:37:26 2021 +0300

    stats: imp cleanup

commit 8b4ad150129111a09be6fa2944a21bd06ab8e5a1
Merge: 385c8a6c 5081ead0
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu Feb 4 14:34:26 2021 +0300

    Merge branch 'master' into imp-errcheck

commit 385c8a6c91e3bf07a457da370c8cc77820b91600
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Fri Jan 29 20:41:57 2021 +0300

    all: imp errcheck in tests
This commit is contained in:
Ainar Garipov 2021-02-04 15:12:34 +03:00
parent 676f8c7671
commit fa33568fab
10 changed files with 65 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/dhcpd/dhcpd_test.go
View File

@ -45,12 +45,17 @@ func TestDB(t *testing.T) {
l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa") l.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:aa")
exp1 := time.Now().Add(time.Hour) exp1 := time.Now().Add(time.Hour)
l.Expiry = exp1 l.Expiry = exp1
s.srv4.(*v4Server).addLease(&l)
srv4, ok := s.srv4.(*v4Server)
assert.True(t, ok)
srv4.addLease(&l)
l2 := Lease{} l2 := Lease{}
l2.IP = net.IP{192, 168, 10, 101} l2.IP = net.IP{192, 168, 10, 101}
l2.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:bb") l2.HWAddr, _ = net.ParseMAC("aa:aa:aa:aa:aa:bb")
s.srv4.AddStaticLease(l2) err = s.srv4.AddStaticLease(l2)
assert.Nil(t, err)
_ = os.Remove("leases.db") _ = os.Remove("leases.db")
s.dbStore() s.dbStore()

9
internal/dhcpd/v4_test.go
View File

@ -69,7 +69,8 @@ func TestV4StaticLeaseAddReplaceDynamic(t *testing.T) {
notify: notify4, notify: notify4,
} }
sIface, err := v4Create(conf) sIface, err := v4Create(conf)
s := sIface.(*v4Server) s, ok := sIface.(*v4Server)
assert.True(t, ok)
assert.Nil(t, err) assert.Nil(t, err)
// add dynamic lease // add dynamic lease
@ -121,7 +122,8 @@ func TestV4StaticLeaseGet(t *testing.T) {
notify: notify4, notify: notify4,
} }
sIface, err := v4Create(conf) sIface, err := v4Create(conf)
s := sIface.(*v4Server) s, ok := sIface.(*v4Server)
assert.True(t, ok)
assert.Nil(t, err) assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}}
@ -184,7 +186,8 @@ func TestV4DynamicLeaseGet(t *testing.T) {
}, },
} }
sIface, err := v4Create(conf) sIface, err := v4Create(conf)
s := sIface.(*v4Server) s, ok := sIface.(*v4Server)
assert.True(t, ok)
assert.Nil(t, err) assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}} s.conf.dnsIPAddrs = []net.IP{{192, 168, 10, 1}}

9
internal/dhcpd/v6_test.go
View File

@ -64,7 +64,8 @@ func TestV6StaticLeaseAddReplaceDynamic(t *testing.T) {
notify: notify6, notify: notify6,
} }
sIface, err := v6Create(conf) sIface, err := v6Create(conf)
s := sIface.(*v6Server) s, ok := sIface.(*v6Server)
assert.True(t, ok)
assert.Nil(t, err) assert.Nil(t, err)
// add dynamic lease // add dynamic lease
@ -113,7 +114,8 @@ func TestV6GetLease(t *testing.T) {
notify: notify6, notify: notify6,
} }
sIface, err := v6Create(conf) sIface, err := v6Create(conf)
s := sIface.(*v6Server) s, ok := sIface.(*v6Server)
assert.True(t, ok)
assert.Nil(t, err) assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("2000::1")} s.conf.dnsIPAddrs = []net.IP{net.ParseIP("2000::1")}
s.sid = dhcpv6.Duid{ s.sid = dhcpv6.Duid{
@ -173,7 +175,8 @@ func TestV6GetDynamicLease(t *testing.T) {
notify: notify6, notify: notify6,
} }
sIface, err := v6Create(conf) sIface, err := v6Create(conf)
s := sIface.(*v6Server) s, ok := sIface.(*v6Server)
assert.True(t, ok)
assert.Nil(t, err) assert.Nil(t, err)
s.conf.dnsIPAddrs = []net.IP{net.ParseIP("2000::1")} s.conf.dnsIPAddrs = []net.IP{net.ParseIP("2000::1")}
s.sid = dhcpv6.Duid{ s.sid = dhcpv6.Duid{

5
internal/dnsfilter/dnsfilter_test.go
View File

@ -683,7 +683,10 @@ func TestWhitelist(t *testing.T) {
ID: 0, Data: []byte(whiteRules), ID: 0, Data: []byte(whiteRules),
}} }}
d := newForTest(nil, filters) d := newForTest(nil, filters)
d.SetFilters(filters, whiteFilters, false)
err := d.SetFilters(filters, whiteFilters, false)
assert.Nil(t, err)
t.Cleanup(d.Close) t.Cleanup(d.Close)
// Matched by white filter. // Matched by white filter.

12
internal/dnsforward/dnsforward_test.go
View File

@ -1113,8 +1113,10 @@ func TestPTRResponseFromDHCPLeases(t *testing.T) {
assert.Equal(t, dns.TypePTR, resp.Answer[0].Header().Rrtype) assert.Equal(t, dns.TypePTR, resp.Answer[0].Header().Rrtype)
assert.Equal(t, "1.0.0.127.in-addr.arpa.", resp.Answer[0].Header().Name) assert.Equal(t, "1.0.0.127.in-addr.arpa.", resp.Answer[0].Header().Name)
ptr := resp.Answer[0].(*dns.PTR) ptr, ok := resp.Answer[0].(*dns.PTR)
assert.Equal(t, "localhost.", ptr.Ptr) if assert.True(t, ok) {
assert.Equal(t, "localhost.", ptr.Ptr)
}
s.Close() s.Close()
} }
@ -1158,8 +1160,10 @@ func TestPTRResponseFromHosts(t *testing.T) {
assert.Equal(t, dns.TypePTR, resp.Answer[0].Header().Rrtype) assert.Equal(t, dns.TypePTR, resp.Answer[0].Header().Rrtype)
assert.Equal(t, "1.0.0.127.in-addr.arpa.", resp.Answer[0].Header().Name) assert.Equal(t, "1.0.0.127.in-addr.arpa.", resp.Answer[0].Header().Name)
ptr := resp.Answer[0].(*dns.PTR) ptr, ok := resp.Answer[0].(*dns.PTR)
assert.Equal(t, "host.", ptr.Ptr) if assert.True(t, ok) {
assert.Equal(t, "host.", ptr.Ptr)
}
s.Close() s.Close()
} }

32
internal/dnsforward/dnsrewrite_test.go
View File

@ -130,9 +130,11 @@ func TestServer_FilterDNSRewrite(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode) assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
if assert.Len(t, d.Res.Answer, 1) { if assert.Len(t, d.Res.Answer, 1) {
ans := d.Res.Answer[0].(*dns.MX) ans, ok := d.Res.Answer[0].(*dns.MX)
assert.Equal(t, mx.Exchange, ans.Mx) if assert.True(t, ok) {
assert.Equal(t, mx.Preference, ans.Preference) assert.Equal(t, mx.Exchange, ans.Mx)
assert.Equal(t, mx.Preference, ans.Preference)
}
} }
}) })
@ -145,11 +147,13 @@ func TestServer_FilterDNSRewrite(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode) assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
if assert.Len(t, d.Res.Answer, 1) { if assert.Len(t, d.Res.Answer, 1) {
ans := d.Res.Answer[0].(*dns.SVCB) ans, ok := d.Res.Answer[0].(*dns.SVCB)
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key()) if assert.True(t, ok) {
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String()) assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Target, ans.Target) assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Priority, ans.Priority) assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority)
}
} }
}) })
@ -162,11 +166,13 @@ func TestServer_FilterDNSRewrite(t *testing.T) {
assert.Nil(t, err) assert.Nil(t, err)
assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode) assert.Equal(t, dns.RcodeSuccess, d.Res.Rcode)
if assert.Len(t, d.Res.Answer, 1) { if assert.Len(t, d.Res.Answer, 1) {
ans := d.Res.Answer[0].(*dns.HTTPS) ans, ok := d.Res.Answer[0].(*dns.HTTPS)
assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key()) if assert.True(t, ok) {
assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String()) assert.Equal(t, dns.SVCB_ALPN, ans.Value[0].Key())
assert.Equal(t, svcb.Target, ans.Target) assert.Equal(t, svcb.Params["alpn"], ans.Value[0].String())
assert.Equal(t, svcb.Priority, ans.Priority) assert.Equal(t, svcb.Target, ans.Target)
assert.Equal(t, svcb.Priority, ans.Priority)
}
} }
}) })
} }

1
internal/home/auth_test.go
View File

@ -79,7 +79,6 @@ func TestAuth(t *testing.T) {
assert.Equal(t, checkSessionNotFound, a.checkSession(sessStr)) assert.Equal(t, checkSessionNotFound, a.checkSession(sessStr))
a.Close() a.Close()
os.Remove(fn)
} }
// implements http.ResponseWriter // implements http.ResponseWriter

5
internal/home/middlewares_test.go
View File

@ -42,7 +42,10 @@ func TestLimitRequestBody(t *testing.T) {
return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
var b []byte var b []byte
b, *err = ioutil.ReadAll(r.Body) b, *err = ioutil.ReadAll(r.Body)
w.Write(b) _, werr := w.Write(b)
if werr != nil {
panic(werr)
}
}) })
} }

11
internal/stats/stats_test.go
View File

@ -34,6 +34,10 @@ func TestStats(t *testing.T) {
Filename: "./stats.db", Filename: "./stats.db",
LimitDays: 1, LimitDays: 1,
} }
t.Cleanup(func() {
assert.Nil(t, os.Remove(conf.Filename))
})
s, _ := createObject(conf) s, _ := createObject(conf)
e := Entry{} e := Entry{}
@ -86,7 +90,6 @@ func TestStats(t *testing.T) {
s.clear() s.clear()
s.Close() s.Close()
os.Remove(conf.Filename)
} }
func TestLargeNumbers(t *testing.T) { func TestLargeNumbers(t *testing.T) {
@ -102,7 +105,10 @@ func TestLargeNumbers(t *testing.T) {
LimitDays: 1, LimitDays: 1,
UnitID: newID, UnitID: newID,
} }
os.Remove(conf.Filename) t.Cleanup(func() {
assert.Nil(t, os.Remove(conf.Filename))
})
s, _ := createObject(conf) s, _ := createObject(conf)
e := Entry{} e := Entry{}
@ -128,7 +134,6 @@ func TestLargeNumbers(t *testing.T) {
assert.EqualValues(t, int(hour)*n, d.NumDNSQueries) assert.EqualValues(t, int(hour)*n, d.NumDNSQueries)
s.Close() s.Close()
os.Remove(conf.Filename)
} }
// this code is a chunk copied from getData() that generates aggregate data per day // this code is a chunk copied from getData() that generates aggregate data per day

5
scripts/make/go-lint.sh
View File

@ -140,7 +140,8 @@ ineffassign .
unparam ./... unparam ./...
git ls-files -- '*.go' '*.md' '*.yaml' '*.yml' 'Makefile'\ git ls-files -- '*.go' '*.md' '*.mod' '*.sh' '*.yaml' '*.yml'\
'Makefile'\
| xargs misspell --error | xargs misspell --error
looppointer ./... looppointer ./...
@ -157,7 +158,7 @@ nilness ./...
# errcheck ./... # errcheck ./...
exit_on_output sh -c ' exit_on_output sh -c '
errcheck --asserts --ignoregenerated ./... |\ errcheck --asserts --ignoregenerated ./... |\
{ grep -e "defer" -e "_test\.go:" -v || exit 0; } { grep -e "defer" -v || exit 0; }
' '
staticcheck ./... staticcheck ./...