daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pull request: all: imp errcheck in tests

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

11
internal/stats/stats_test.go
View File

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