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

Pull request 1786: rm-context-fields

Browse Source 
Merge in DNS/adguard-home from rm-context-fields to master

Squashed commit of the following:

commit 402bbba6a68f163cd6a3751a50ecd544eebc875f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Mar 28 13:07:11 2023 +0300

    aghnet: names

commit 209a2bb7878ee9110595f1fcf09df7f83777b80f
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Mar 28 13:03:33 2023 +0300

    home: typo

commit 61684815c260d5d7a34be612e06714456399a833
Merge: 7adfcf15 132ec556
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Tue Mar 28 13:02:18 2023 +0300

    Merge branch 'master' into rm-context-fields

commit 7adfcf1576b52f80137aa9044355bfbec6243e28
Merge: 0d5b85f5 0df32601
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Sun Mar 26 14:25:27 2023 +0300

    Merge branch 'master' into rm-context-fields

commit 0d5b85f51b3eb72c3e905d5ad82c17cd932b246b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Sun Mar 26 13:21:26 2023 +0300

    all: rm unnecessary home context fields
This commit is contained in:
Ainar Garipov
2023-03-28 13:27:46 +03:00
parent 132ec556dc
commit 487675b9ad
3 changed files with 54 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
internal/aghnet/hostscontainer_test.go
View File

@@ -80,7 +80,7 @@ func TestNewHostsContainer(t *testing.T) {
hc, err := NewHostsContainer(0, testFS, &aghtest.FSWatcher{
OnEvents: onEvents,
OnAdd: onAdd,
OnClose: func() (err error) { panic("not implemented") },
OnClose: func() (err error) { return nil },
}, tc.paths...)
if tc.wantErr != nil {
require.ErrorIs(t, err, tc.wantErr)
@@ -124,7 +124,7 @@ func TestNewHostsContainer(t *testing.T) {
errWatcher := &aghtest.FSWatcher{
OnEvents: func() (e <-chan struct{}) { panic("not implemented") },
OnAdd: func(name string) (err error) { return errOnAdd },
OnClose: func() (err error) { panic("not implemented") },
OnClose: func() (err error) { return nil },
}
hc, err := NewHostsContainer(0, testFS, errWatcher, p)
@@ -155,7 +155,7 @@ func TestHostsContainer_refresh(t *testing.T) {
return nil
},
OnClose: func() (err error) { panic("not implemented") },
OnClose: func() (err error) { return nil },
}
hc, err := NewHostsContainer(0, testFS, w, "dir")
@@ -292,7 +292,7 @@ func TestHostsContainer_Translate(t *testing.T) {
stubWatcher := aghtest.FSWatcher{
OnEvents: func() (e <-chan struct{}) { return nil },
OnAdd: func(name string) (err error) { return nil },
OnClose: func() (err error) { panic("not implemented") },
OnClose: func() (err error) { return nil },
}
require.NoError(t, fstest.TestFS(testdata, "etc_hosts"))
@@ -524,7 +524,7 @@ func TestHostsContainer(t *testing.T) {
stubWatcher := aghtest.FSWatcher{
OnEvents: func() (e <-chan struct{}) { return nil },
OnAdd: func(name string) (err error) { return nil },
OnClose: func() (err error) { panic("not implemented") },
OnClose: func() (err error) { return nil },
}
hc, err := NewHostsContainer(listID, testdata, &stubWatcher, "etc_hosts")