AdGuardHome/internal/aghnet/hostscontainer_test.go

458 lines
11 KiB
Go
Raw Normal View History

package aghnet_test
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
import (
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
"net/netip"
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
"path"
"sync/atomic"
"testing"
"testing/fstest"
"time"
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
"github.com/AdguardTeam/AdGuardHome/internal/aghchan"
"github.com/AdguardTeam/AdGuardHome/internal/aghnet"
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
"github.com/AdguardTeam/golibs/errors"
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
"github.com/AdguardTeam/golibs/hostsfile"
"github.com/AdguardTeam/golibs/netutil"
"github.com/AdguardTeam/golibs/testutil"
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
// nl is a newline character.
const nl = "\n"
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
// Variables mirroring the etc_hosts file from testdata.
var (
addr1000 = netip.MustParseAddr("1.0.0.0")
addr1001 = netip.MustParseAddr("1.0.0.1")
addr1002 = netip.MustParseAddr("1.0.0.2")
addr1003 = netip.MustParseAddr("1.0.0.3")
addr1004 = netip.MustParseAddr("1.0.0.4")
addr1357 = netip.MustParseAddr("1.3.5.7")
addr4216 = netip.MustParseAddr("4.2.1.6")
addr7531 = netip.MustParseAddr("7.5.3.1")
addr0 = netip.MustParseAddr("::")
addr1 = netip.MustParseAddr("::1")
addr2 = netip.MustParseAddr("::2")
addr3 = netip.MustParseAddr("::3")
addr4 = netip.MustParseAddr("::4")
addr42 = netip.MustParseAddr("::42")
addr13 = netip.MustParseAddr("::13")
addr31 = netip.MustParseAddr("::31")
testHosts = map[netip.Addr][]*hostsfile.Record{
addr1000: {{
Addr: addr1000,
Source: "./testdata/etc_hosts",
Names: []string{"hello", "hello.world"},
}, {
Addr: addr1000,
Source: "./testdata/etc_hosts",
Names: []string{"hello.world.again"},
}, {
Addr: addr1000,
Source: "./testdata/etc_hosts",
Names: []string{"hello.world"},
}},
addr1001: {{
Addr: addr1001,
Source: "./testdata/etc_hosts",
Names: []string{"simplehost"},
}, {
Addr: addr1001,
Source: "./testdata/etc_hosts",
Names: []string{"simplehost"},
}},
addr1002: {{
Addr: addr1002,
Source: "./testdata/etc_hosts",
Names: []string{"a.whole", "lot.of", "aliases", "for.testing"},
}},
addr1003: {{
Addr: addr1003,
Source: "./testdata/etc_hosts",
Names: []string{"*"},
}},
addr1004: {{
Addr: addr1004,
Source: "./testdata/etc_hosts",
Names: []string{"*.com"},
}},
addr1357: {{
Addr: addr1357,
Source: "./testdata/etc_hosts",
Names: []string{"domain4", "domain4.alias"},
}},
addr7531: {{
Addr: addr7531,
Source: "./testdata/etc_hosts",
Names: []string{"domain4.alias", "domain4"},
}},
addr4216: {{
Addr: addr4216,
Source: "./testdata/etc_hosts",
Names: []string{"domain", "domain.alias"},
}},
addr0: {{
Addr: addr0,
Source: "./testdata/etc_hosts",
Names: []string{"hello", "hello.world"},
}, {
Addr: addr0,
Source: "./testdata/etc_hosts",
Names: []string{"hello.world.again"},
}, {
Addr: addr0,
Source: "./testdata/etc_hosts",
Names: []string{"hello.world"},
}},
addr1: {{
Addr: addr1,
Source: "./testdata/etc_hosts",
Names: []string{"simplehost"},
}, {
Addr: addr1,
Source: "./testdata/etc_hosts",
Names: []string{"simplehost"},
}},
addr2: {{
Addr: addr2,
Source: "./testdata/etc_hosts",
Names: []string{"a.whole", "lot.of", "aliases", "for.testing"},
}},
addr3: {{
Addr: addr3,
Source: "./testdata/etc_hosts",
Names: []string{"*"},
}},
addr4: {{
Addr: addr4,
Source: "./testdata/etc_hosts",
Names: []string{"*.com"},
}},
addr42: {{
Addr: addr42,
Source: "./testdata/etc_hosts",
Names: []string{"domain.alias", "domain"},
}},
addr13: {{
Addr: addr13,
Source: "./testdata/etc_hosts",
Names: []string{"domain6", "domain6.alias"},
}},
addr31: {{
Addr: addr31,
Source: "./testdata/etc_hosts",
Names: []string{"domain6.alias", "domain6"},
}},
}
)
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
func TestNewHostsContainer(t *testing.T) {
const dirname = "dir"
const filename = "file1"
p := path.Join(dirname, filename)
testFS := fstest.MapFS{
p: &fstest.MapFile{Data: []byte("127.0.0.1 localhost")},
}
testCases := []struct {
wantErr error
name string
paths []string
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}{{
wantErr: nil,
name: "one_file",
paths: []string{p},
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}, {
wantErr: aghnet.ErrNoHostsPaths,
name: "no_files",
paths: []string{},
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}, {
wantErr: aghnet.ErrNoHostsPaths,
name: "non-existent_file",
paths: []string{path.Join(dirname, filename+"2")},
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}, {
wantErr: nil,
name: "whole_dir",
paths: []string{dirname},
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
onAdd := func(name string) (err error) {
assert.Contains(t, tc.paths, name)
return nil
}
var eventsCalledCounter uint32
eventsCh := make(chan struct{})
onEvents := func() (e <-chan struct{}) {
assert.Equal(t, uint32(1), atomic.AddUint32(&eventsCalledCounter, 1))
return eventsCh
}
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
hc, err := aghnet.NewHostsContainer(testFS, &aghtest.FSWatcher{
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
OnEvents: onEvents,
OnAdd: onAdd,
OnClose: func() (err error) { return nil },
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}, tc.paths...)
if tc.wantErr != nil {
require.ErrorIs(t, err, tc.wantErr)
assert.Nil(t, hc)
return
}
testutil.CleanupAndRequireSuccess(t, hc.Close)
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
require.NoError(t, err)
require.NotNil(t, hc)
assert.NotNil(t, <-hc.Upd())
eventsCh <- struct{}{}
assert.Equal(t, uint32(1), atomic.LoadUint32(&eventsCalledCounter))
})
}
t.Run("nil_fs", func(t *testing.T) {
require.Panics(t, func() {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
_, _ = aghnet.NewHostsContainer(nil, &aghtest.FSWatcher{
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
// Those shouldn't panic.
OnEvents: func() (e <-chan struct{}) { return nil },
OnAdd: func(name string) (err error) { return nil },
OnClose: func() (err error) { return nil },
}, p)
})
})
t.Run("nil_watcher", func(t *testing.T) {
require.Panics(t, func() {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
_, _ = aghnet.NewHostsContainer(testFS, nil, p)
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
})
})
t.Run("err_watcher", func(t *testing.T) {
const errOnAdd errors.Error = "error"
errWatcher := &aghtest.FSWatcher{
OnEvents: func() (e <-chan struct{}) { panic("not implemented") },
OnAdd: func(name string) (err error) { return errOnAdd },
OnClose: func() (err error) { return nil },
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
hc, err := aghnet.NewHostsContainer(testFS, errWatcher, p)
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
require.ErrorIs(t, err, errOnAdd)
assert.Nil(t, hc)
})
}
func TestHostsContainer_refresh(t *testing.T) {
// TODO(e.burkov): Test the case with no actual updates.
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
ip := netutil.IPv4Localhost()
ipStr := ip.String()
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
anotherIPStr := "1.2.3.4"
anotherIP := netip.MustParseAddr(anotherIPStr)
testFS := fstest.MapFS{"dir/file1": &fstest.MapFile{Data: []byte(ipStr + ` hostname` + nl)}}
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
// event is a convenient alias for an empty struct{} to emit test events.
type event = struct{}
eventsCh := make(chan event, 1)
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
t.Cleanup(func() { close(eventsCh) })
w := &aghtest.FSWatcher{
OnEvents: func() (e <-chan event) { return eventsCh },
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
OnAdd: func(name string) (err error) {
assert.Equal(t, "dir", name)
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
return nil
},
OnClose: func() (err error) { return nil },
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
hc, err := aghnet.NewHostsContainer(testFS, w, "dir")
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, hc.Close)
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
checkRefresh := func(t *testing.T, want aghnet.Hosts) {
t.Helper()
upd, ok := aghchan.MustReceive(hc.Upd(), 1*time.Second)
require.True(t, ok)
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
assert.Equal(t, want, upd)
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}
t.Run("initial_refresh", func(t *testing.T) {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
checkRefresh(t, aghnet.Hosts{
ip: {{
Addr: ip,
Source: "file1",
Names: []string{"hostname"},
}},
})
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
})
t.Run("second_refresh", func(t *testing.T) {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
testFS["dir/file2"] = &fstest.MapFile{Data: []byte(anotherIPStr + ` alias` + nl)}
eventsCh <- event{}
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
checkRefresh(t, aghnet.Hosts{
ip: {{
Addr: ip,
Source: "file1",
Names: []string{"hostname"},
}},
anotherIP: {{
Addr: anotherIP,
Source: "file2",
Names: []string{"alias"},
}},
})
})
t.Run("double_refresh", func(t *testing.T) {
// Make a change once.
testFS["dir/file1"] = &fstest.MapFile{Data: []byte(ipStr + ` alias` + nl)}
eventsCh <- event{}
// Require the changes are written.
require.Eventually(t, func() bool {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
ips := hc.MatchName("hostname")
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
return len(ips) == 0
}, 5*time.Second, time.Second/2)
// Make a change again.
testFS["dir/file2"] = &fstest.MapFile{Data: []byte(ipStr + ` hostname` + nl)}
eventsCh <- event{}
// Require the changes are written.
require.Eventually(t, func() bool {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
ips := hc.MatchName("hostname")
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
return len(ips) > 0
}, 5*time.Second, time.Second/2)
assert.Len(t, hc.Upd(), 1)
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
})
}
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
func TestHostsContainer_MatchName(t *testing.T) {
require.NoError(t, fstest.TestFS(testdata, "etc_hosts"))
stubWatcher := aghtest.FSWatcher{
OnEvents: func() (e <-chan struct{}) { return nil },
OnAdd: func(name string) (err error) { return nil },
OnClose: func() (err error) { return nil },
}
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
testCases := []struct {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
req string
name string
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
want []*hostsfile.Record
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}{{
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
req: "simplehost",
name: "simple",
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
want: append(testHosts[addr1001], testHosts[addr1]...),
}, {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
req: "hello.world",
name: "hello_alias",
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
want: []*hostsfile.Record{
testHosts[addr1000][0],
testHosts[addr1000][2],
testHosts[addr0][0],
testHosts[addr0][2],
},
}, {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
req: "hello.world.again",
name: "other_line_alias",
want: []*hostsfile.Record{
testHosts[addr1000][1],
testHosts[addr0][1],
},
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
}, {
req: "say.hello",
name: "hello_subdomain",
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
want: nil,
}, {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
req: "say.hello.world",
name: "hello_alias_subdomain",
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
want: nil,
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}, {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
req: "for.testing",
name: "lots_of_aliases",
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
want: append(testHosts[addr1002], testHosts[addr2]...),
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}, {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
req: "nonexistent.example",
name: "non-existing",
want: nil,
}, {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
req: "domain",
name: "issue_4216_4_6",
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
want: append(testHosts[addr4216], testHosts[addr42]...),
}, {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
req: "domain4",
name: "issue_4216_4",
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
want: append(testHosts[addr1357], testHosts[addr7531]...),
}, {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
req: "domain6",
name: "issue_4216_6",
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
want: append(testHosts[addr13], testHosts[addr31]...),
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
}}
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
hc, err := aghnet.NewHostsContainer(testdata, &stubWatcher, "etc_hosts")
require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, hc.Close)
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
recs := hc.MatchName(tc.req)
assert.Equal(t, tc.want, recs)
})
}
}
func TestHostsContainer_MatchAddr(t *testing.T) {
require.NoError(t, fstest.TestFS(testdata, "etc_hosts"))
stubWatcher := aghtest.FSWatcher{
OnEvents: func() (e <-chan struct{}) { return nil },
OnAdd: func(name string) (err error) { return nil },
OnClose: func() (err error) { return nil },
}
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
hc, err := aghnet.NewHostsContainer(testdata, &stubWatcher, "etc_hosts")
require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, hc.Close)
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
testCases := []struct {
req netip.Addr
name string
want []*hostsfile.Record
}{{
req: netip.AddrFrom4([4]byte{1, 0, 0, 1}),
name: "reverse",
want: testHosts[addr1001],
}}
for _, tc := range testCases {
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
t.Run(tc.name, func(t *testing.T) {
Pull request 1964: AG-23599 use hostsfile Merge in DNS/adguard-home from AG-23599-use-hostsfile to master Squashed commit of the following: commit 4766e67a9d5faa4bc89a2a935d187ce4829f7214 Merge: 38369360b 762e5be97 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Aug 22 16:33:54 2023 +0300 Merge branch 'master' into AG-23599-use-hostsfile commit 38369360b7d0e5c9ec373c5a06bac8792ca9cd69 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 18:09:15 2023 +0300 filtering: imp tests commit 1c4d4a9f9639f048173e1c949f39f9ecb6ed0347 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 14:00:10 2023 +0300 filtering: imp cognit, cyclo commit c50c33d7240c2812a715759fabf140e02184b729 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Aug 21 12:57:31 2023 +0300 filtering: imp code commit 92203b16719a717a2946c0401e166b1b38ddb7bc Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Aug 18 17:39:11 2023 +0300 all: imp code, docs commit 523e8cd50f9136feede657385b7274fa6ba64131 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 15:14:02 2023 +0300 all: fix ipv6 commit 6ce4537132615cbdc34a0b1f326fedd2b63c355d Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 17 14:17:27 2023 +0300 all: rm urlfilter from hosts commit d6666e851680c7e586325ea5970e0356ab919074 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 15:09:52 2023 +0300 WIP commit 4a2732960558bef6636d3c428bad4c7c830016ca Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 16 14:47:13 2023 +0300 all: use hostsfile
2023-08-22 14:45:11 +01:00
recs := hc.MatchAddr(tc.req)
assert.Equal(t, tc.want, recs)
Pull request: 2499 merge rewrites vol.1 Merge in DNS/adguard-home from 2499-merge-rewrites-vol.1 to master Updates #2499. Squashed commit of the following: commit 6b308bc2b360cee8c22e506f31d62bacb4bf8fb3 Merge: f49e9186 2b635bf6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 19:23:07 2021 +0300 Merge branch 'master' into 2499-merge-rewrites-vol.1 commit f49e9186ffc8b7074d03c6721ee56cdb09243684 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 18:50:49 2021 +0300 aghos: fix fs events filtering commit 567dd646556606212af5dab60e3ecbb8fff22c25 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 14 16:50:37 2021 +0300 all: imp code, docs, fix windows commit 140c8bf519345eb54d0e7500a996fcf465353d71 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:41:53 2021 +0300 aghnet: use const commit bebf3f76bd394a498ccad812c57d4507c69529ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 19:32:37 2021 +0300 all: imp tests, docs commit 9bfdbb6eb454833135d616e208e82699f98e2562 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 18:42:20 2021 +0300 all: imp path more, imp docs commit ee9ea4c132a6b17787d150bf2bee703abaa57be3 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Oct 13 16:09:46 2021 +0300 all: fix windows, imp paths commit 6fac8338a81e9ecfebfc23a1adcb964e89f6aee6 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 19:53:35 2021 +0300 all: imp code, docs commit da1ce1a2a3dd2be3fdff2412a6dbd596859dc249 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Oct 11 18:22:50 2021 +0300 aghnet: fix windows tests commit d29de359ed68118d71efb226a8433fac15ff5c66 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 21:02:14 2021 +0300 all: repl & imp commit 1356c08944cdbb85ce5532d90fe5b077219ce5ff Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Oct 8 01:41:19 2021 +0300 all: add tests, mv logic, added tmpfs commit f4b11adf8998bc8d9d955c5ac9f386f671bd5213 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Oct 7 14:26:30 2021 +0300 all: imp filewalker, refactor hosts container
2021-10-14 17:39:21 +01:00
})
}
}