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

fix tests

This commit is contained in:
Simon Zolin 2019-07-23 20:01:50 +03:00
parent 6f51df7d2e
commit d9265aa9a8
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dnsfilter/dnsfilter_test.go
View File

@ -26,13 +26,13 @@ import (
func purgeCaches() { func purgeCaches() {
if gctx.safebrowsingCache != nil { if gctx.safebrowsingCache != nil {
gctx.safebrowsingCache.Purge() gctx.safebrowsingCache.Reset()
} }
if gctx.parentalCache != nil { if gctx.parentalCache != nil {
gctx.parentalCache.Purge() gctx.parentalCache.Reset()
} }
if gctx.safeSearchCache != nil { if gctx.safeSearchCache != nil {
gctx.safeSearchCache.Purge() gctx.safeSearchCache.Reset()
} }
} }
@ -44,6 +44,11 @@ func _Func() string {
} }
func NewForTest(c *Config, filters map[int]string) *Dnsfilter { func NewForTest(c *Config, filters map[int]string) *Dnsfilter {
if c != nil {
c.SafeBrowsingCacheSize = 1024
c.SafeSearchCacheSize = 1024
c.ParentalCacheSize = 1024
}
d := New(c, filters) d := New(c, filters)
purgeCaches() purgeCaches()
return d return d
@ -269,11 +274,7 @@ func TestSafeSearchCacheYandex(t *testing.T) {
} }
// Check cache // Check cache
cachedValue, isFound, err := getCachedReason(gctx.safeSearchCache, domain) cachedValue, isFound := getCachedResult(gctx.safeSearchCache, domain)
if err != nil {
t.Fatalf("An error occured during cache search for %s: %s", domain, err)
}
if !isFound { if !isFound {
t.Fatalf("Safesearch cache doesn't work for %s!", domain) t.Fatalf("Safesearch cache doesn't work for %s!", domain)
@ -330,11 +331,7 @@ func TestSafeSearchCacheGoogle(t *testing.T) {
} }
// Check cache // Check cache
cachedValue, isFound, err := getCachedReason(gctx.safeSearchCache, domain) cachedValue, isFound := getCachedResult(gctx.safeSearchCache, domain)
if err != nil {
t.Fatalf("An error occured during cache search for %s: %s", domain, err)
}
if !isFound { if !isFound {
t.Fatalf("Safesearch cache doesn't work for %s!", domain) t.Fatalf("Safesearch cache doesn't work for %s!", domain)

4
dnsforward/dnsforward_test.go
View File

@ -458,6 +458,10 @@ func createTestServer(t *testing.T) *Server {
s.conf.FilteringConfig.SafeBrowsingEnabled = true s.conf.FilteringConfig.SafeBrowsingEnabled = true
s.conf.Filters = make([]dnsfilter.Filter, 0) s.conf.Filters = make([]dnsfilter.Filter, 0)
s.conf.SafeBrowsingCacheSize = 1024
s.conf.SafeSearchCacheSize = 1024
s.conf.ParentalCacheSize = 1024
rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1 host.example.org\n" rules := "||nxdomain.example.org^\n||null.example.org^\n127.0.0.1 host.example.org\n"
filter := dnsfilter.Filter{ID: 0, Data: []byte(rules)} filter := dnsfilter.Filter{ID: 0, Data: []byte(rules)}
s.conf.Filters = append(s.conf.Filters, filter) s.conf.Filters = append(s.conf.Filters, filter)