docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
require.NoError(t, l.rotate()) | <mask> addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> // Write to disk (first file).
<mask> require.Nil(t, l.flushLogBuffer(true))
<mask> // Start writing to the second file.
<mask> require.Nil(t, l.rotate())
<mask> // Add disk entries.
<mask> addEntry(l, "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2))
<mask> // Write to disk.
<mask> require.Nil(t, l.flushLogBuffer(true))
<mask> // Add memory entries.
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlog_test.go |
require.NoError(t, l.flushLogBuffer(true)) | <mask> require.Nil(t, l.rotate())
<mask> // Add disk entries.
<mask> addEntry(l, "example.org", net.IPv4(1, 1, 1, 2), net.IPv4(2, 2, 2, 2))
<mask> // Write to disk.
<mask> require.Nil(t, l.flushLogBuffer(true))
<mask> // Add memory entries.
<mask> addEntry(l, "test.example.org", net.IPv4(1, 1, 1, 3), net.IPv4(2, 2, 2, 3))
<mask> addEntry(l, "example.com", net.IPv4(1, 1, 1, 4), net.IPv4(2, 2, 2, 4))
<mask>
<mask> type tcAssertion struct {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, l.rotate())
</s> add require.NoError(t, l.rotate()) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove want: nil,
name: "positive",
n: 1,
</s> add wantErrMsg: "",
name: "positive",
n: 1, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlog_test.go |
require.NoError(t, l.flushLogBuffer(true)) | <mask> for i := 0; i < entNum; i++ {
<mask> addEntry(l, secondPageDomain, net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> }
<mask> // Write them to the first file.
<mask> require.Nil(t, l.flushLogBuffer(true))
<mask> // Add more to the in-memory part of log.
<mask> for i := 0; i < entNum; i++ {
<mask> addEntry(l, firstPageDomain, net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> }
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, l.rotate())
</s> add require.NoError(t, l.rotate()) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlog_test.go |
require.NoError(t, l.flushLogBuffer(true)) | <mask> for i := 0; i < entNum; i++ {
<mask> addEntry(l, "example.org", net.IPv4(1, 1, 1, 1), net.IPv4(2, 2, 2, 1))
<mask> }
<mask> // Write them to disk.
<mask> require.Nil(t, l.flushLogBuffer(true))
<mask>
<mask> params := newSearchParams()
<mask>
<mask> for _, maxFileScanEntries := range []int{5, 0} {
<mask> t.Run(fmt.Sprintf("limit_%d", maxFileScanEntries), func(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, l.rotate())
</s> add require.NoError(t, l.rotate()) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlog_test.go |
require.NoError(t, msg.Unpack(entry.Answer)) | <mask> assert.Equal(t, "A", entry.QType)
<mask> assert.Equal(t, "IN", entry.QClass)
<mask>
<mask> msg := &dns.Msg{}
<mask> require.Nil(t, msg.Unpack(entry.Answer))
<mask> require.Len(t, msg.Answer, 1)
<mask>
<mask> ip := proxyutil.GetIPFromDNSRecord(msg.Answer[0]).To16()
<mask> assert.Equal(t, answer, ip)
<mask> }
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlog_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/errors"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // prepareTestFile prepares one test query log file with the specified lines
<mask> // count.
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err)
| <mask> testFile := prepareTestFiles(t, 1, linesNum)[0]
<mask>
<mask> // Create the new QLogFile instance.
<mask> file, err := NewQLogFile(testFile)
<mask> require.Nil(t, err)
<mask> assert.NotNil(t, file)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, file.Close())
<mask> })
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove t.Cleanup(func() {
assert.Nil(t, reader.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, reader.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
testutil.CleanupAndRequireSuccess(t, file.Close) | <mask> // Create the new QLogFile instance.
<mask> file, err := NewQLogFile(testFile)
<mask> require.Nil(t, err)
<mask> assert.NotNil(t, file)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, file.Close())
<mask> })
<mask>
<mask> return file
<mask> }
<mask>
<mask> func TestQLogFile_ReadNext(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove t.Cleanup(func() {
assert.Nil(t, reader.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, reader.Close) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err) | <mask> q := newTestQLogFile(t, tc.linesNum)
<mask>
<mask> // Calculate the expected position.
<mask> fileInfo, err := q.file.Stat()
<mask> require.Nil(t, err)
<mask> var expPos int64
<mask> if expPos = fileInfo.Size(); expPos > 0 {
<mask> expPos--
<mask> }
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove require.NotNil(t, err)
</s> add require.Error(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err) | <mask> }
<mask>
<mask> // Seek to the start.
<mask> pos, err := q.SeekStart()
<mask> require.Nil(t, err)
<mask> require.EqualValues(t, expPos, pos)
<mask>
<mask> var read int
<mask> var line string
<mask> for err == nil {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.NotNil(t, err)
</s> add require.Error(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err) | <mask>
<mask> for _, tc := range testCases {
<mask> t.Run(l.name+"_"+tc.name, func(t *testing.T) {
<mask> line, err := getQLogFileLine(q, tc.line)
<mask> require.Nil(t, err)
<mask> ts := readQLogTimestamp(line)
<mask> assert.NotEqualValues(t, 0, ts)
<mask>
<mask> // Try seeking to that line now.
<mask> pos, _, err := q.SeekTS(ts)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove readCloser := io.NopCloser(strings.NewReader(tc.rStr))
</s> add </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err) | <mask> assert.NotEqualValues(t, 0, ts)
<mask>
<mask> // Try seeking to that line now.
<mask> pos, _, err := q.SeekTS(ts)
<mask> require.Nil(t, err)
<mask> assert.NotEqualValues(t, 0, pos)
<mask>
<mask> testLine, err := q.ReadNext()
<mask> require.Nil(t, err)
<mask> assert.Equal(t, line, testLine)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err) | <mask> require.Nil(t, err)
<mask> assert.NotEqualValues(t, 0, pos)
<mask>
<mask> testLine, err := q.ReadNext()
<mask> require.Nil(t, err)
<mask> assert.Equal(t, line, testLine)
<mask> })
<mask> }
<mask> }
<mask> }
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err) | <mask> lateTS, _ := time.Parse(time.RFC3339, "2100-01-02T15:04:05Z07:00")
<mask> testCases[1].ts = lateTS.UnixNano()
<mask>
<mask> line, err := getQLogFileLine(q, l.num/2)
<mask> require.Nil(t, err)
<mask> testCases[2].ts = readQLogTimestamp(line) - 1
<mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> assert.NotEqualValues(t, 0, tc.ts)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove readCloser := io.NopCloser(strings.NewReader(tc.rStr))
</s> add </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.Error(t, err)
| <mask>
<mask> var depth int
<mask> _, depth, err = q.SeekTS(tc.ts)
<mask> assert.NotEmpty(t, l.num)
<mask> require.NotNil(t, err)
<mask> if tc.leq {
<mask> assert.LessOrEqual(t, depth, int(math.Log2(float64(l.num))+3))
<mask> }
<mask> })
<mask> }
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove r, err := newIPRange(tc.start, tc.end)
if tc.wantErrMsg == "" {
assert.NoError(t, err)
assert.NotNil(t, r)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add _, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err) | <mask> q := newTestQLogFile(t, 2)
<mask>
<mask> // Seek to the start.
<mask> pos, err := q.SeekStart()
<mask> require.Nil(t, err)
<mask> assert.Greater(t, pos, int64(0))
<mask>
<mask> // Read first line.
<mask> line, err := q.ReadNext()
<mask> require.Nil(t, err)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err) | <mask> assert.Greater(t, pos, int64(0))
<mask>
<mask> // Read first line.
<mask> line, err := q.ReadNext()
<mask> require.Nil(t, err)
<mask> assert.Contains(t, line, "0.0.0.2")
<mask> assert.True(t, strings.HasPrefix(line, "{"), line)
<mask> assert.True(t, strings.HasSuffix(line, "}"), line)
<mask>
<mask> // Read second line.
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err) | <mask> assert.True(t, strings.HasSuffix(line, "}"), line)
<mask>
<mask> // Read second line.
<mask> line, err = q.ReadNext()
<mask> require.Nil(t, err)
<mask> assert.EqualValues(t, 0, q.position)
<mask> assert.Contains(t, line, "0.0.0.1")
<mask> assert.True(t, strings.HasPrefix(line, "{"), line)
<mask> assert.True(t, strings.HasSuffix(line, "}"), line)
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, f.Close) | <mask> }
<mask>
<mask> func NewTestQLogFileData(t *testing.T, data string) (file *QLogFile) {
<mask> f, err := os.CreateTemp(t.TempDir(), "*.txt")
<mask> require.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, f.Close())
<mask> })
<mask>
<mask> _, err = f.WriteString(data)
<mask> require.Nil(t, err)
<mask>
<mask> file, err = NewQLogFile(f.Name())
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove t.Cleanup(func() {
require.NoError(t, f.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, f.Close) </s> remove require.NotNilf(t, err, "expected an error because %s but no error returned", descr)
</s> add require.Error(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err) | <mask> assert.Nil(t, f.Close())
<mask> })
<mask>
<mask> _, err = f.WriteString(data)
<mask> require.Nil(t, err)
<mask>
<mask> file, err = NewQLogFile(f.Name())
<mask> require.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, file.Close())
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, f.Close) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove t.Cleanup(func() {
require.NoError(t, f.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, f.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, file.Close) | <mask> _, err = f.WriteString(data)
<mask> require.Nil(t, err)
<mask>
<mask> file, err = NewQLogFile(f.Name())
<mask> require.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, file.Close())
<mask> })
<mask>
<mask> return file
<mask> }
<mask>
<mask> func TestQLog_Seek(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, f.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, f.Close) </s> remove t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove t.Cleanup(func() {
assert.Nil(t, reader.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, reader.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogfile_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "io"
<mask> "testing"
<mask> "time"
<mask>
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // newTestQLogReader creates new *QLogReader for tests and registers the
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogreader_test.go |
require.NoError(t, err) | <mask> testFiles := prepareTestFiles(t, filesNum, linesNum)
<mask>
<mask> // Create the new QLogReader instance.
<mask> reader, err := NewQLogReader(testFiles)
<mask> require.Nil(t, err)
<mask>
<mask> assert.NotNil(t, reader)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, reader.Close())
<mask> })
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove t.Cleanup(func() {
assert.Nil(t, reader.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, reader.Close) </s> remove t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, s.Stop())
})
</s> add assert.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, s.Stop) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogreader_test.go |
testutil.CleanupAndRequireSuccess(t, reader.Close) | <mask> reader, err := NewQLogReader(testFiles)
<mask> require.Nil(t, err)
<mask>
<mask> assert.NotNil(t, reader)
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, reader.Close())
<mask> })
<mask>
<mask> return reader
<mask> }
<mask>
<mask> func TestQLogReader(t *testing.T) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove require.Nil(t, err)
t.Cleanup(func() {
assert.Nil(t, file.Close())
})
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, file.Close) </s> remove r, err := newIPRange(tc.start, tc.end)
if tc.wantErrMsg == "" {
assert.NoError(t, err)
assert.NotNil(t, r)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add _, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogreader_test.go |
require.NoError(t, err) | <mask> r := newTestQLogReader(t, tc.filesNum, tc.linesNum)
<mask>
<mask> // Seek to the start.
<mask> err := r.SeekStart()
<mask> require.Nil(t, err)
<mask>
<mask> // Read everything.
<mask> var read int
<mask> var line string
<mask> for err == nil {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogreader_test.go |
require.NoError(t, err) | <mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> ts, err := time.Parse(time.RFC3339Nano, tc.time)
<mask> require.Nil(t, err)
<mask>
<mask> err = r.SeekTS(ts.UnixNano())
<mask> assert.ErrorIs(t, err, tc.want)
<mask> })
<mask> }
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove readCloser := io.NopCloser(strings.NewReader(tc.rStr))
</s> add </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogreader_test.go |
require.NoError(t, err) | <mask>
<mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> err := r.SeekStart()
<mask> require.Nil(t, err)
<mask>
<mask> for i := 1; i < tc.start; i++ {
<mask> _, err = r.ReadNext()
<mask> require.Nil(t, err)
<mask> }
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogreader_test.go |
require.NoError(t, err) | <mask> require.Nil(t, err)
<mask>
<mask> for i := 1; i < tc.start; i++ {
<mask> _, err = r.ReadNext()
<mask> require.Nil(t, err)
<mask> }
<mask>
<mask> _, err = r.ReadNext()
<mask> assert.Equal(t, tc.want, err)
<mask> })
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove require.Nil(t, l.flushLogBuffer(true))
</s> add require.NoError(t, l.flushLogBuffer(true)) </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/querylog/qlogreader_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "sync/atomic"
<mask> "testing"
<mask>
<mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/stats/stats_test.go |
require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, func() (err error) { | <mask> LimitDays: 1,
<mask> }
<mask>
<mask> s, err := createObject(conf)
<mask> require.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> s.clear()
<mask> s.Close()
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
t.Cleanup(func() {
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, func() (err error) { </s> remove assert.Nil(t, os.Remove(conf.Filename))
</s> add return os.Remove(conf.Filename) </s> remove assert.Nil(t, os.Remove(conf.Filename))
</s> add return os.Remove(conf.Filename) </s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) </s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/stats/stats_test.go |
return os.Remove(conf.Filename) | <mask> require.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> s.clear()
<mask> s.Close()
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
<mask> s.Update(Entry{
<mask> Domain: "domain",
<mask> Client: "127.0.0.1",
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
t.Cleanup(func() {
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, func() (err error) { </s> remove assert.Nil(t, os.Remove(conf.Filename))
</s> add return os.Remove(conf.Filename) </s> remove require.Nil(t, err)
t.Cleanup(func() {
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, func() (err error) { </s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/stats/stats_test.go |
require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, func() (err error) { | <mask> LimitDays: 1,
<mask> UnitID: newID,
<mask> }
<mask> s, err := createObject(conf)
<mask> require.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> s.Close()
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
<mask> // Number of distinct clients and domains every hour.
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, os.Remove(conf.Filename))
</s> add return os.Remove(conf.Filename) </s> remove require.Nil(t, err)
t.Cleanup(func() {
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, func() (err error) { </s> remove assert.Nil(t, os.Remove(conf.Filename))
</s> add return os.Remove(conf.Filename) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/stats/stats_test.go |
return os.Remove(conf.Filename) | <mask> s, err := createObject(conf)
<mask> require.Nil(t, err)
<mask> t.Cleanup(func() {
<mask> s.Close()
<mask> assert.Nil(t, os.Remove(conf.Filename))
<mask> })
<mask>
<mask> // Number of distinct clients and domains every hour.
<mask> const n = 1000
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove require.Nil(t, err)
t.Cleanup(func() {
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, func() (err error) { </s> remove require.Nil(t, err)
t.Cleanup(func() {
</s> add require.NoError(t, err)
testutil.CleanupAndRequireSuccess(t, func() (err error) { </s> remove assert.Nil(t, os.Remove(conf.Filename))
</s> add return os.Remove(conf.Filename) </s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) </s> remove t.Cleanup(func() {
s.Close()
})
</s> add t.Cleanup(s.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/stats/stats_test.go |
"github.com/AdguardTeam/golibs/testutil" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
<mask> "github.com/stretchr/testify/assert"
<mask> "github.com/stretchr/testify/require"
<mask> )
<mask>
<mask> // TODO(a.garipov): Rewrite these tests.
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove "github.com/stretchr/testify/require"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
"github.com/stretchr/testify/require" | <mask> "github.com/AdguardTeam/AdGuardHome/internal/aghtest"
<mask> "github.com/AdguardTeam/AdGuardHome/internal/version"
<mask> "github.com/AdguardTeam/golibs/testutil"
<mask> "github.com/stretchr/testify/assert"
<mask> )
<mask>
<mask> // TODO(a.garipov): Rewrite these tests.
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
testutil.CleanupAndRequireSuccess(t, l.Close) | <mask> "download_freebsd_arm64": "https://static.adguard.com/adguardhome/beta/AdGuardHome_freebsd_arm64.tar.gz"
<mask> }`
<mask>
<mask> l, lport := startHTTPServer(jsonData)
<mask> t.Cleanup(func() { assert.Nil(t, l.Close()) })
<mask>
<mask> u := NewUpdater(&Config{
<mask> Client: &http.Client{},
<mask> Version: "v0.103.0-beta.1",
<mask> Channel: version.ChannelBeta,
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> }
<mask> u.versionCheckURL = fakeURL.String()
<mask>
<mask> info, err := u.VersionInfo(false)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "v0.103.0-beta.2", info.NewVersion)
<mask> assert.Equal(t, "AdGuard Home v0.103.0-beta.2 is now available!", info.Announcement)
<mask> assert.Equal(t, "https://github.com/AdguardTeam/AdGuardHome/internal/releases", info.AnnouncementURL)
<mask> assert.Equal(t, "v0.0", info.SelfUpdateMinVersion)
<mask> if assert.NotNil(t, info.CanAutoUpdate) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove r, err := newIPRange(tc.start, tc.end)
if tc.wantErrMsg == "" {
assert.NoError(t, err)
assert.NotNil(t, r)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add _, err := newIPRange(tc.start, tc.end)
testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err) | <mask> }
<mask>
<mask> // check cached
<mask> _, err = u.VersionInfo(false)
<mask> assert.Nil(t, err)
<mask> }
<mask>
<mask> func TestUpdate(t *testing.T) {
<mask> wd := t.TempDir()
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove require.NotNil(t, err)
</s> add require.Error(t, err) </s> remove assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644))
</s> add require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644)) </s> remove assert.Equal(t, tc.want, err)
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) </s> remove if tc.wantErrMsg == "" {
assert.NoError(t, err)
} else {
require.Error(t, err)
assert.Equal(t, tc.wantErrMsg, err.Error())
}
</s> add testutil.AssertErrorMsg(t, tc.wantErrMsg, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644)) | <mask>
<mask> func TestUpdate(t *testing.T) {
<mask> wd := t.TempDir()
<mask>
<mask> assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
<mask> assert.Nil(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
<mask> assert.Nil(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
<mask> assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644))
<mask>
<mask> // start server for returning package file
<mask> pkgData, err := os.ReadFile("testdata/AdGuardHome.tar.gz")
<mask> assert.Nil(t, err)
<mask> l, lport := startHTTPServer(string(pkgData))
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.exe"), []byte("AdGuardHome.exe"), 0o755))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644))
</s> add require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.exe"), []byte("AdGuardHome.exe"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644)) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644))
<mask>
<mask> // start server for returning package file
<mask> pkgData, err := os.ReadFile("testdata/AdGuardHome.tar.gz")
<mask> assert.Nil(t, err)
<mask> l, lport := startHTTPServer(string(pkgData))
<mask> t.Cleanup(func() { assert.Nil(t, l.Close()) })
<mask>
<mask> u := NewUpdater(&Config{
<mask> Client: &http.Client{},
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644))
</s> add require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644)) </s> remove assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.exe"), []byte("AdGuardHome.exe"), 0o755))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644))
</s> add require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.exe"), []byte("AdGuardHome.exe"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644)) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
testutil.CleanupAndRequireSuccess(t, l.Close) | <mask> // start server for returning package file
<mask> pkgData, err := os.ReadFile("testdata/AdGuardHome.tar.gz")
<mask> assert.Nil(t, err)
<mask> l, lport := startHTTPServer(string(pkgData))
<mask> t.Cleanup(func() { assert.Nil(t, l.Close()) })
<mask>
<mask> u := NewUpdater(&Config{
<mask> Client: &http.Client{},
<mask> Version: "v0.103.0",
<mask> })
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, u.prepare())
| <mask> u.confName = filepath.Join(u.workDir, "AdGuardHome.yaml")
<mask> u.newVersion = "v0.103.1"
<mask> u.packageURL = fakeURL.String()
<mask>
<mask> assert.Nil(t, u.prepare())
<mask> u.currentExeName = filepath.Join(wd, "AdGuardHome")
<mask> assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
<mask> assert.Nil(t, u.unpack())
<mask> // assert.Nil(t, u.check())
<mask> assert.Nil(t, u.backup())
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, u.prepare())
</s> add require.NoError(t, u.prepare())
</s> remove assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
assert.Nil(t, u.unpack())
</s> add require.NoError(t, u.downloadPackageFile(u.packageURL, u.packageName))
require.NoError(t, u.unpack()) </s> remove assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
assert.Nil(t, u.unpack())
// assert.Nil(t, u.check())
assert.Nil(t, u.backup())
assert.Nil(t, u.replace())
</s> add require.NoError(t, u.downloadPackageFile(u.packageURL, u.packageName))
require.NoError(t, u.unpack())
// require.NoError(t, u.check())
require.NoError(t, u.backup())
require.NoError(t, u.replace())
</s> remove assert.Nil(t, u.backup())
assert.Nil(t, u.replace())
</s> add require.NoError(t, u.backup())
require.NoError(t, u.replace())
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, u.downloadPackageFile(u.packageURL, u.packageName))
require.NoError(t, u.unpack())
// require.NoError(t, u.check())
require.NoError(t, u.backup())
require.NoError(t, u.replace())
| <mask> u.packageURL = fakeURL.String()
<mask>
<mask> assert.Nil(t, u.prepare())
<mask> u.currentExeName = filepath.Join(wd, "AdGuardHome")
<mask> assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
<mask> assert.Nil(t, u.unpack())
<mask> // assert.Nil(t, u.check())
<mask> assert.Nil(t, u.backup())
<mask> assert.Nil(t, u.replace())
<mask> u.clean()
<mask>
<mask> // check backup files
<mask> d, err := os.ReadFile(filepath.Join(wd, "agh-backup", "AdGuardHome.yaml"))
<mask> assert.Nil(t, err)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, u.backup())
assert.Nil(t, u.replace())
</s> add require.NoError(t, u.backup())
require.NoError(t, u.replace())
</s> remove assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
assert.Nil(t, u.unpack())
</s> add require.NoError(t, u.downloadPackageFile(u.packageURL, u.packageName))
require.NoError(t, u.unpack()) </s> remove assert.Nil(t, u.prepare())
</s> add require.NoError(t, u.prepare())
</s> remove assert.Nil(t, u.prepare())
</s> add require.NoError(t, u.prepare())
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> u.clean()
<mask>
<mask> // check backup files
<mask> d, err := os.ReadFile(filepath.Join(wd, "agh-backup", "AdGuardHome.yaml"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "AdGuardHome.yaml", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "agh-backup", "AdGuardHome"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "AdGuardHome", string(d))
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> assert.Nil(t, err)
<mask> assert.Equal(t, "AdGuardHome.yaml", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "agh-backup", "AdGuardHome"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "AdGuardHome", string(d))
<mask>
<mask> // check updated files
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome"))
<mask> assert.Nil(t, err)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> assert.Equal(t, "AdGuardHome", string(d))
<mask>
<mask> // check updated files
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "1", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "README.md"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "2", string(d))
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> assert.Nil(t, err)
<mask> assert.Equal(t, "1", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "README.md"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "2", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "LICENSE.txt"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "3", string(d))
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> assert.Nil(t, err)
<mask> assert.Equal(t, "2", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "LICENSE.txt"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "3", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome.yaml"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "AdGuardHome.yaml", string(d))
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> assert.Nil(t, err)
<mask> assert.Equal(t, "3", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome.yaml"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "AdGuardHome.yaml", string(d))
<mask> }
<mask>
<mask> func TestUpdateWindows(t *testing.T) {
<mask> wd := t.TempDir()
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.exe"), []byte("AdGuardHome.exe"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644)) | <mask>
<mask> func TestUpdateWindows(t *testing.T) {
<mask> wd := t.TempDir()
<mask>
<mask> assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.exe"), []byte("AdGuardHome.exe"), 0o755))
<mask> assert.Nil(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
<mask> assert.Nil(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
<mask> assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644))
<mask>
<mask> // start server for returning package file
<mask> pkgData, err := os.ReadFile("testdata/AdGuardHome.zip")
<mask> assert.Nil(t, err)
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644))
</s> add require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644)) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err) | <mask> assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644))
<mask>
<mask> // start server for returning package file
<mask> pkgData, err := os.ReadFile("testdata/AdGuardHome.zip")
<mask> assert.Nil(t, err)
<mask>
<mask> l, lport := startHTTPServer(string(pkgData))
<mask> t.Cleanup(func() { assert.Nil(t, l.Close()) })
<mask>
<mask> u := NewUpdater(&Config{
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644))
</s> add require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome"), []byte("AdGuardHome"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644)) </s> remove assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.exe"), []byte("AdGuardHome.exe"), 0o755))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
assert.Nil(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644))
</s> add require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.exe"), []byte("AdGuardHome.exe"), 0o755))
require.NoError(t, os.WriteFile(filepath.Join(wd, "README.md"), []byte("README.md"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "LICENSE.txt"), []byte("LICENSE.txt"), 0o644))
require.NoError(t, os.WriteFile(filepath.Join(wd, "AdGuardHome.yaml"), []byte("AdGuardHome.yaml"), 0o644)) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
testutil.CleanupAndRequireSuccess(t, l.Close) | <mask> pkgData, err := os.ReadFile("testdata/AdGuardHome.zip")
<mask> assert.Nil(t, err)
<mask>
<mask> l, lport := startHTTPServer(string(pkgData))
<mask> t.Cleanup(func() { assert.Nil(t, l.Close()) })
<mask>
<mask> u := NewUpdater(&Config{
<mask> Client: &http.Client{},
<mask> GOOS: "windows",
<mask> Version: "v0.103.0",
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, u.prepare())
| <mask> u.confName = filepath.Join(u.workDir, "AdGuardHome.yaml")
<mask> u.newVersion = "v0.103.1"
<mask> u.packageURL = fakeURL.String()
<mask>
<mask> assert.Nil(t, u.prepare())
<mask> u.currentExeName = filepath.Join(wd, "AdGuardHome.exe")
<mask> assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
<mask> assert.Nil(t, u.unpack())
<mask> // assert.Nil(t, u.check())
<mask> assert.Nil(t, u.backup())
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, u.prepare())
</s> add require.NoError(t, u.prepare())
</s> remove assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
assert.Nil(t, u.unpack())
</s> add require.NoError(t, u.downloadPackageFile(u.packageURL, u.packageName))
require.NoError(t, u.unpack()) </s> remove assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
assert.Nil(t, u.unpack())
// assert.Nil(t, u.check())
assert.Nil(t, u.backup())
assert.Nil(t, u.replace())
</s> add require.NoError(t, u.downloadPackageFile(u.packageURL, u.packageName))
require.NoError(t, u.unpack())
// require.NoError(t, u.check())
require.NoError(t, u.backup())
require.NoError(t, u.replace())
</s> remove assert.Nil(t, u.backup())
assert.Nil(t, u.replace())
</s> add require.NoError(t, u.backup())
require.NoError(t, u.replace())
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, u.downloadPackageFile(u.packageURL, u.packageName))
require.NoError(t, u.unpack()) | <mask> u.packageURL = fakeURL.String()
<mask>
<mask> assert.Nil(t, u.prepare())
<mask> u.currentExeName = filepath.Join(wd, "AdGuardHome.exe")
<mask> assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
<mask> assert.Nil(t, u.unpack())
<mask> // assert.Nil(t, u.check())
<mask> assert.Nil(t, u.backup())
<mask> assert.Nil(t, u.replace())
<mask> u.clean()
<mask>
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
assert.Nil(t, u.unpack())
// assert.Nil(t, u.check())
assert.Nil(t, u.backup())
assert.Nil(t, u.replace())
</s> add require.NoError(t, u.downloadPackageFile(u.packageURL, u.packageName))
require.NoError(t, u.unpack())
// require.NoError(t, u.check())
require.NoError(t, u.backup())
require.NoError(t, u.replace())
</s> remove assert.Nil(t, u.prepare())
</s> add require.NoError(t, u.prepare())
</s> remove assert.Nil(t, u.prepare())
</s> add require.NoError(t, u.prepare())
</s> remove assert.Nil(t, u.backup())
assert.Nil(t, u.replace())
</s> add require.NoError(t, u.backup())
require.NoError(t, u.replace())
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, u.backup())
require.NoError(t, u.replace())
| <mask> u.currentExeName = filepath.Join(wd, "AdGuardHome.exe")
<mask> assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
<mask> assert.Nil(t, u.unpack())
<mask> // assert.Nil(t, u.check())
<mask> assert.Nil(t, u.backup())
<mask> assert.Nil(t, u.replace())
<mask> u.clean()
<mask>
<mask> // check backup files
<mask> d, err := os.ReadFile(filepath.Join(wd, "agh-backup", "AdGuardHome.yaml"))
<mask> assert.Nil(t, err)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
assert.Nil(t, u.unpack())
// assert.Nil(t, u.check())
assert.Nil(t, u.backup())
assert.Nil(t, u.replace())
</s> add require.NoError(t, u.downloadPackageFile(u.packageURL, u.packageName))
require.NoError(t, u.unpack())
// require.NoError(t, u.check())
require.NoError(t, u.backup())
require.NoError(t, u.replace())
</s> remove assert.Nil(t, u.downloadPackageFile(u.packageURL, u.packageName))
assert.Nil(t, u.unpack())
</s> add require.NoError(t, u.downloadPackageFile(u.packageURL, u.packageName))
require.NoError(t, u.unpack()) </s> remove assert.Nil(t, u.prepare())
</s> add require.NoError(t, u.prepare())
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> u.clean()
<mask>
<mask> // check backup files
<mask> d, err := os.ReadFile(filepath.Join(wd, "agh-backup", "AdGuardHome.yaml"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "AdGuardHome.yaml", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "agh-backup", "AdGuardHome.exe"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "AdGuardHome.exe", string(d))
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> assert.Nil(t, err)
<mask> assert.Equal(t, "AdGuardHome.yaml", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "agh-backup", "AdGuardHome.exe"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "AdGuardHome.exe", string(d))
<mask>
<mask> // check updated files
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome.exe"))
<mask> assert.Nil(t, err)
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> assert.Equal(t, "AdGuardHome.exe", string(d))
<mask>
<mask> // check updated files
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome.exe"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "1", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "README.md"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "2", string(d))
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> assert.Nil(t, err)
<mask> assert.Equal(t, "1", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "README.md"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "2", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "LICENSE.txt"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "3", string(d))
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> assert.Nil(t, err)
<mask> assert.Equal(t, "2", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "LICENSE.txt"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "3", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome.yaml"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "AdGuardHome.yaml", string(d))
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> assert.Nil(t, err)
<mask> assert.Equal(t, "3", string(d))
<mask>
<mask> d, err = os.ReadFile(filepath.Join(wd, "AdGuardHome.yaml"))
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "AdGuardHome.yaml", string(d))
<mask> }
<mask>
<mask> func TestUpdater_VersionInto_ARM(t *testing.T) {
<mask> const jsonData = `{
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
</s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
testutil.CleanupAndRequireSuccess(t, l.Close) | <mask> "download_linux_armv7": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_armv7.tar.gz"
<mask> }`
<mask>
<mask> l, lport := startHTTPServer(jsonData)
<mask> t.Cleanup(func() { assert.Nil(t, l.Close()) })
<mask>
<mask> u := NewUpdater(&Config{
<mask> Client: &http.Client{},
<mask> Version: "v0.103.0-beta.1",
<mask> Channel: version.ChannelBeta,
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> }
<mask> u.versionCheckURL = fakeURL.String()
<mask>
<mask> info, err := u.VersionInfo(false)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "v0.103.0-beta.2", info.NewVersion)
<mask> assert.Equal(t, "AdGuard Home v0.103.0-beta.2 is now available!", info.Announcement)
<mask> assert.Equal(t, "https://github.com/AdguardTeam/AdGuardHome/internal/releases", info.AnnouncementURL)
<mask> assert.Equal(t, "v0.0", info.SelfUpdateMinVersion)
<mask> if assert.NotNil(t, info.CanAutoUpdate) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
testutil.CleanupAndRequireSuccess(t, l.Close) | <mask> "download_linux_mips_softfloat": "https://static.adguard.com/adguardhome/beta/AdGuardHome_linux_mips_softfloat.tar.gz"
<mask> }`
<mask>
<mask> l, lport := startHTTPServer(jsonData)
<mask> t.Cleanup(func() { assert.Nil(t, l.Close()) })
<mask>
<mask> u := NewUpdater(&Config{
<mask> Client: &http.Client{},
<mask> Version: "v0.103.0-beta.1",
<mask> Channel: version.ChannelBeta,
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove t.Cleanup(func() { assert.Nil(t, l.Close()) })
</s> add testutil.CleanupAndRequireSuccess(t, l.Close) </s> remove assert.Nil(t, err)
</s> add require.NoError(t, err)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
require.NoError(t, err)
| <mask> }
<mask> u.versionCheckURL = fakeURL.String()
<mask>
<mask> info, err := u.VersionInfo(false)
<mask> assert.Nil(t, err)
<mask> assert.Equal(t, "v0.103.0-beta.2", info.NewVersion)
<mask> assert.Equal(t, "AdGuard Home v0.103.0-beta.2 is now available!", info.Announcement)
<mask> assert.Equal(t, "https://github.com/AdguardTeam/AdGuardHome/internal/releases", info.AnnouncementURL)
<mask> assert.Equal(t, "v0.0", info.SelfUpdateMinVersion)
<mask> if assert.NotNil(t, info.CanAutoUpdate) {
</s> Pull request: use testutil
Squashed commit of the following:
commit 5345a14b3565f358c56a37500cafb35b7e397951
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 21:13:06 2021 +0300
all: fix windows tests
commit 8b9cdbe3e78f43339d21277f04e686bb154f6968
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 20:23:55 2021 +0300
all: imp code
commit 271fdbe74c29d8ea4b53d7f56d2a36612dfed7b3
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 19:43:32 2021 +0300
all: imp testing
commit e340f9d48679c57fc8eb579b8b78d4957be111c4
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date: Thu Oct 21 18:53:51 2021 +0300
all: use testutil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/ea8950a80d5d6ce59d4af45d42e9addbc9b7013e | internal/updater/updater_test.go |
<mask> github.com/spf13/cobra v1.1.3 // indirect
<mask> github.com/stretchr/testify v1.6.1
<mask> github.com/ti-mo/netfilter v0.4.0
<mask> github.com/u-root/u-root v7.0.0+incompatible
<mask> github.com/willf/bitset v1.1.11
<mask> go.etcd.io/bbolt v1.3.5
<mask> golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
<mask> golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
<mask> golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
<mask> golang.org/x/sys v0.0.0-20210309074719-68d13333faf2
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
</s> add </s> remove // Server calls this function when leases data changes
</s> add // notify is a way to signal to other components that leases have
// change. notify must be called outside of locked sections, since the
// clients might want to get the new data.
//
// TODO(a.garipov): This is utter madness and must be refactored. It
// just begs for deadlock bugs and other nastiness. </s> remove "github.com/willf/bitset"
</s> add </s> remove expiryStr = expiry.Format(time.RFC3339)
</s> add expiryStr = l.Expiry.Format(time.RFC3339) </s> remove leasedOffsets *bitset.BitSet
</s> add leasedOffsets *bitSet | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | go.mod | |
<mask> github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
<mask> github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0=
<mask> github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
<mask> github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
<mask> github.com/willf/bitset v1.1.11 h1:N7Z7E9UvjW+sGsEl7k/SJrvY2reP1A07MrGuCjIOjRE=
<mask> github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI=
<mask> github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
<mask> github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
<mask> go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
<mask> go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
<mask> go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove github.com/willf/bitset v1.1.11
</s> add </s> remove s.leasesLock.Unlock()
</s> add </s> remove leasedOffsets *bitset.BitSet
</s> add leasedOffsets *bitSet </s> remove if l.Expiry.Unix() != leaseExpireStatic && !s.conf.ipRange.contains(l.IP) {
log.Debug("dhcpv4: skipping a lease with ip %v: not within current ip range", l.IP)
</s> add if !l.IsStatic() && !r.contains(l.IP) {
log.Debug(
"dhcpv4: skipping lease %s (%s): not within current ip range",
l.IP,
l.HWAddr,
) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | go.sum | |
leases4 := s.srv4.getLeasesRef() | <mask> // Store lease table in DB
<mask> func (s *Server) dbStore() {
<mask> var leases []leaseJSON
<mask>
<mask> leases4 := s.srv4.GetLeasesRef()
<mask> for _, l := range leases4 {
<mask> if l.Expiry.Unix() == 0 {
<mask> continue
<mask> }
<mask> lease := leaseJSON{
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove leases6 := s.srv6.GetLeasesRef()
</s> add leases6 := s.srv6.getLeasesRef() </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) </s> remove unix := l.Expiry.Unix()
if unix > now || unix == leaseExpireStatic {
</s> add if l.Expiry.After(now) || l.IsStatic() { </s> remove if l.Expiry.Unix() != leaseExpireStatic && !s.conf.ipRange.contains(l.IP) {
log.Debug("dhcpv4: skipping a lease with ip %v: not within current ip range", l.IP)
</s> add if !l.IsStatic() && !r.contains(l.IP) {
log.Debug(
"dhcpv4: skipping lease %s (%s): not within current ip range",
l.IP,
l.HWAddr,
) </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/db.go |
leases6 := s.srv6.getLeasesRef() | <mask> leases = append(leases, lease)
<mask> }
<mask>
<mask> if s.srv6 != nil {
<mask> leases6 := s.srv6.GetLeasesRef()
<mask> for _, l := range leases6 {
<mask> if l.Expiry.Unix() == 0 {
<mask> continue
<mask> }
<mask> lease := leaseJSON{
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove leases4 := s.srv4.GetLeasesRef()
</s> add leases4 := s.srv4.getLeasesRef() </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) </s> remove unix := l.Expiry.Unix()
if unix > now || unix == leaseExpireStatic {
</s> add if l.Expiry.After(now) || l.IsStatic() { </s> remove if l.Expiry.Unix() != leaseExpireStatic && !s.conf.ipRange.contains(l.IP) {
log.Debug("dhcpv4: skipping a lease with ip %v: not within current ip range", l.IP)
</s> add if !l.IsStatic() && !r.contains(l.IP) {
log.Debug(
"dhcpv4: skipping lease %s (%s): not within current ip range",
l.IP,
l.HWAddr,
) </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/db.go |
// IsStatic returns true if the lease is static.
//
// TODO(a.garipov): Just make it a boolean field.
func (l *Lease) IsStatic() (ok bool) {
return l != nil && l.Expiry.Unix() == leaseExpireStatic
}
| <mask> Expiry time.Time `json:"expires"`
<mask> }
<mask>
<mask> // MarshalJSON implements the json.Marshaler interface for *Lease.
<mask> func (l *Lease) MarshalJSON() ([]byte, error) {
<mask> var expiryStr string
<mask> if !l.IsStatic() {
<mask> // The front-end is waiting for RFC 3999 format of the time
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if expiry := l.Expiry; expiry.Unix() != leaseExpireStatic {
</s> add if !l.IsStatic() { </s> remove expiryStr = expiry.Format(time.RFC3339)
</s> add expiryStr = l.Expiry.Format(time.RFC3339) </s> remove // GetLeases returns the list of current DHCP leases (thread-safe)
func (s *v4Server) GetLeases(flags int) []Lease {
// The function shouldn't return nil value because zero-length slice
// behaves differently in cases like marshalling. Our front-end also
// requires non-nil value in the response.
result := []Lease{}
now := time.Now().Unix()
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v4Server) GetLeases(flags int) (res []Lease) {
// The function shouldn't return nil, because zero-length slice behaves
// differently in cases like marshalling. Our front-end also requires
// a non-nil value in the response.
res = []Lease{}
// TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
getDynamic := flags&LeasesDynamic != 0
getStatic := flags&LeasesStatic != 0 </s> remove func (s *v4Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v4Server) rmDynamicLease(lease *Lease) (err error) { </s> remove func (s *v4Server) reserveLease(mac net.HardwareAddr) (l *Lease) {
</s> add func (s *v4Server) reserveLease(mac net.HardwareAddr) (l *Lease, err error) { | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/dhcpd.go |
if !l.IsStatic() { | <mask>
<mask> // MarshalJSON implements the json.Marshaler interface for *Lease.
<mask> func (l *Lease) MarshalJSON() ([]byte, error) {
<mask> var expiryStr string
<mask> if expiry := l.Expiry; expiry.Unix() != leaseExpireStatic {
<mask> // The front-end is waiting for RFC 3999 format of the time
<mask> // value. It also shouldn't got an Expiry field for static
<mask> // leases.
<mask> //
<mask> // See https://github.com/AdguardTeam/AdGuardHome/issues/2692.
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove expiryStr = expiry.Format(time.RFC3339)
</s> add expiryStr = l.Expiry.Format(time.RFC3339) </s> remove // GetLeases returns the list of current DHCP leases (thread-safe)
func (s *v4Server) GetLeases(flags int) []Lease {
// The function shouldn't return nil value because zero-length slice
// behaves differently in cases like marshalling. Our front-end also
// requires non-nil value in the response.
result := []Lease{}
now := time.Now().Unix()
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v4Server) GetLeases(flags int) (res []Lease) {
// The function shouldn't return nil, because zero-length slice behaves
// differently in cases like marshalling. Our front-end also requires
// a non-nil value in the response.
res = []Lease{}
// TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
getDynamic := flags&LeasesDynamic != 0
getStatic := flags&LeasesStatic != 0 </s> remove func (s *v4Server) rmDynamicLease(lease Lease) error {
</s> add func (s *v4Server) rmDynamicLease(lease *Lease) (err error) { </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/dhcpd.go |
expiryStr = l.Expiry.Format(time.RFC3339) | <mask> // value. It also shouldn't got an Expiry field for static
<mask> // leases.
<mask> //
<mask> // See https://github.com/AdguardTeam/AdGuardHome/issues/2692.
<mask> expiryStr = expiry.Format(time.RFC3339)
<mask> }
<mask>
<mask> type lease Lease
<mask> return json.Marshal(&struct {
<mask> HWAddr string `json:"mac"`
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if expiry := l.Expiry; expiry.Unix() != leaseExpireStatic {
</s> add if !l.IsStatic() { </s> remove // GetLeases returns the list of current DHCP leases (thread-safe)
func (s *v4Server) GetLeases(flags int) []Lease {
// The function shouldn't return nil value because zero-length slice
// behaves differently in cases like marshalling. Our front-end also
// requires non-nil value in the response.
result := []Lease{}
now := time.Now().Unix()
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v4Server) GetLeases(flags int) (res []Lease) {
// The function shouldn't return nil, because zero-length slice behaves
// differently in cases like marshalling. Our front-end also requires
// a non-nil value in the response.
res = []Lease{}
// TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
getDynamic := flags&LeasesDynamic != 0
getStatic := flags&LeasesStatic != 0 </s> remove // AddStaticLease adds a static lease (thread-safe)
func (s *v4Server) AddStaticLease(lease Lease) error {
if len(lease.IP) != 4 {
return fmt.Errorf("invalid IP")
</s> add // AddStaticLease adds a static lease. It is safe for concurrent use.
func (s *v4Server) AddStaticLease(l Lease) (err error) {
defer agherr.Annotate("dhcpv4: %w", &err)
if ip4 := l.IP.To4(); ip4 == nil {
return fmt.Errorf("invalid ip %q, only ipv4 is supported", l.IP) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/dhcpd.go |
err = srv4.addLease(&leases[0])
require.Nil(t, err) | <mask>
<mask> srv4, ok := s.srv4.(*v4Server)
<mask> require.True(t, ok)
<mask>
<mask> srv4.addLease(&leases[0])
<mask> require.Nil(t, s.srv4.AddStaticLease(leases[1]))
<mask>
<mask> s.dbStore()
<mask> t.Cleanup(func() {
<mask> assert.Nil(t, os.Remove(dbFilename))
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove s.leasedOffsets.Clear(offset)
</s> add s.leasedOffsets.set(offset, false) </s> remove assert.Nil(t, err)
</s> add assert.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove if !ok {
// TODO(a.garipov): Better error handling.
log.Debug("dhcpv4: lease %s (%s) out of range, not adding", l.IP, l.HWAddr)
</s> add if ok {
s.leasedOffsets.set(offset, true)
} </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/dhcpd_test.go |
assert.True(t, ll[0].IsStatic()) | <mask> require.Len(t, ll, len(leases))
<mask>
<mask> assert.Equal(t, leases[1].HWAddr, ll[0].HWAddr)
<mask> assert.Equal(t, leases[1].IP, ll[0].IP)
<mask> assert.EqualValues(t, leaseExpireStatic, ll[0].Expiry.Unix())
<mask>
<mask> assert.Equal(t, leases[0].HWAddr, ll[1].HWAddr)
<mask> assert.Equal(t, leases[0].IP, ll[1].IP)
<mask> assert.Equal(t, leases[0].Expiry.Unix(), ll[1].Expiry.Unix())
<mask> }
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove assert.EqualValues(t, leaseExpireStatic, l.Expiry.Unix())
</s> add assert.True(t, l.IsStatic()) </s> remove assert.EqualValues(t, leaseExpireStatic, ls[0].Expiry.Unix())
</s> add assert.True(t, ls[0].IsStatic()) </s> remove require.NotNil(t, err)
</s> add require.Error(t, err) </s> remove assert.Nil(t, err)
</s> add assert.NoError(t, err) </s> remove return lease
</s> add return l, nil | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/dhcpd_test.go |
func (r *ipRange) offset(ip net.IP) (offset uint64, ok bool) { | <mask> }
<mask>
<mask> // offset returns the offset of ip from the beginning of r. It returns 0 and
<mask> // false if ip is not in r.
<mask> func (r *ipRange) offset(ip net.IP) (offset uint, ok bool) {
<mask> if r == nil {
<mask> return 0, false
<mask> }
<mask>
<mask> ip = ip.To16()
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok </s> remove // addLease adds a lease.
func (s *v4Server) addLease(l *Lease) {
</s> add func (s *v4Server) addStaticLease(l *Lease) (err error) {
subnet := &net.IPNet{
IP: s.conf.routerIP,
Mask: s.conf.subnetMask,
}
if !subnet.Contains(l.IP) {
return fmt.Errorf("subnet %s does not contain the ip %q", subnet, l.IP)
}
s.leases = append(s.leases, l)
</s> remove // GetLeases returns the list of current DHCP leases (thread-safe)
func (s *v4Server) GetLeases(flags int) []Lease {
// The function shouldn't return nil value because zero-length slice
// behaves differently in cases like marshalling. Our front-end also
// requires non-nil value in the response.
result := []Lease{}
now := time.Now().Unix()
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v4Server) GetLeases(flags int) (res []Lease) {
// The function shouldn't return nil, because zero-length slice behaves
// differently in cases like marshalling. Our front-end also requires
// a non-nil value in the response.
res = []Lease{}
// TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
getDynamic := flags&LeasesDynamic != 0
getStatic := flags&LeasesStatic != 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/iprange.go |
return offsetInt.Uint64(), true | <mask> offsetInt := (&big.Int{}).Sub(ipInt, r.start)
<mask>
<mask> // Assume that the range was checked against maxRangeLen during
<mask> // construction.
<mask> return uint(offsetInt.Uint64()), true
<mask> }
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok </s> remove s.leasesLock.Lock()
err := s.rmDynamicLease(lease)
</s> add l.Expiry = time.Unix(leaseExpireStatic, 0)
// Perform the following actions in an anonymous function to make sure
// that the lock gets unlocked before the notification step.
func() {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
err = s.rmDynamicLease(&l)
if err != nil {
err = fmt.Errorf(
"removing dynamic leases for %s (%s): %w",
l.IP,
l.HWAddr,
err,
)
return
}
err = s.addLease(&l)
if err != nil {
err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
return
}
}() </s> remove return nil
</s> add // TODO(a.garipov): Return a special error?
return nil, nil </s> remove // GetLeases returns the list of current DHCP leases (thread-safe)
func (s *v4Server) GetLeases(flags int) []Lease {
// The function shouldn't return nil value because zero-length slice
// behaves differently in cases like marshalling. Our front-end also
// requires non-nil value in the response.
result := []Lease{}
now := time.Now().Unix()
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v4Server) GetLeases(flags int) (res []Lease) {
// The function shouldn't return nil, because zero-length slice behaves
// differently in cases like marshalling. Our front-end also requires
// a non-nil value in the response.
res = []Lease{}
// TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
getDynamic := flags&LeasesDynamic != 0
getStatic := flags&LeasesStatic != 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/iprange.go |
assert.NoError(t, err) | <mask> for _, tc := range testCases {
<mask> t.Run(tc.name, func(t *testing.T) {
<mask> r, err := newIPRange(tc.start, tc.end)
<mask> if tc.wantErrMsg == "" {
<mask> assert.Nil(t, err)
<mask> assert.NotNil(t, r)
<mask> } else {
<mask> require.NotNil(t, err)
<mask> assert.Equal(t, tc.wantErrMsg, err.Error())
<mask> }
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove require.NotNil(t, err)
</s> add require.Error(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove assert.EqualValues(t, leaseExpireStatic, l.Expiry.Unix())
</s> add assert.True(t, l.IsStatic()) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove unix := l.Expiry.Unix()
if unix > now || unix == leaseExpireStatic {
</s> add if l.Expiry.After(now) || l.IsStatic() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/iprange_test.go |
require.Error(t, err) | <mask> if tc.wantErrMsg == "" {
<mask> assert.Nil(t, err)
<mask> assert.NotNil(t, r)
<mask> } else {
<mask> require.NotNil(t, err)
<mask> assert.Equal(t, tc.wantErrMsg, err.Error())
<mask> }
<mask> })
<mask> }
<mask> }
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove assert.Nil(t, err)
</s> add assert.NoError(t, err) </s> remove s.leasedOffsets = &bitset.BitSet{}
</s> add s.leasedOffsets = newBitSet() </s> remove for lease == nil {
lease = s.reserveLease(mac)
if lease == nil {
log.Debug("dhcpv4: No more IP addresses")
</s> add for l == nil {
l, err = s.reserveLease(mac)
if err != nil {
return nil, fmt.Errorf("reserving a lease: %w", err)
}
if l == nil {
log.Debug("dhcpv4: no more ip addresses") </s> remove if lease.Expiry.Unix() != leaseExpireStatic {
</s> add if !lease.IsStatic() { </s> remove s.addLease(l)
</s> add err := s.addLease(l)
if err != nil {
// TODO(a.garipov): Better error handling.
log.Error("dhcpv4: adding a lease for %s (%s): %s", l.IP, l.HWAddr, err)
continue
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/iprange_test.go |
require.NoError(t, err) | <mask>
<mask> func TestIPRange_Contains(t *testing.T) {
<mask> start, end := net.IP{0, 0, 0, 1}, net.IP{0, 0, 0, 3}
<mask> r, err := newIPRange(start, end)
<mask> require.Nil(t, err)
<mask>
<mask> assert.True(t, r.contains(start))
<mask> assert.True(t, r.contains(net.IP{0, 0, 0, 2}))
<mask> assert.True(t, r.contains(end))
<mask>
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove wantOffset uint
</s> add wantOffset uint64 </s> remove assert.EqualValues(t, leaseExpireStatic, l.Expiry.Unix())
</s> add assert.True(t, l.IsStatic()) </s> remove func (r *ipRange) offset(ip net.IP) (offset uint, ok bool) {
</s> add func (r *ipRange) offset(ip net.IP) (offset uint64, ok bool) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/iprange_test.go |
require.NoError(t, err) | <mask>
<mask> func TestIPRange_Find(t *testing.T) {
<mask> start, end := net.IP{0, 0, 0, 1}, net.IP{0, 0, 0, 5}
<mask> r, err := newIPRange(start, end)
<mask> require.Nil(t, err)
<mask>
<mask> want := net.IPv4(0, 0, 0, 2)
<mask> got := r.find(func(ip net.IP) (ok bool) {
<mask> return ip[len(ip)-1]%2 == 0
<mask> })
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove wantOffset uint
</s> add wantOffset uint64 </s> remove func (r *ipRange) offset(ip net.IP) (offset uint, ok bool) {
</s> add func (r *ipRange) offset(ip net.IP) (offset uint64, ok bool) { </s> remove assert.Nil(t, err)
</s> add assert.NoError(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/iprange_test.go |
require.NoError(t, err) | <mask>
<mask> func TestIPRange_Offset(t *testing.T) {
<mask> start, end := net.IP{0, 0, 0, 1}, net.IP{0, 0, 0, 5}
<mask> r, err := newIPRange(start, end)
<mask> require.Nil(t, err)
<mask>
<mask> testCases := []struct {
<mask> name string
<mask> in net.IP
<mask> wantOffset uint
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove wantOffset uint
</s> add wantOffset uint64 </s> remove assert.Nil(t, err)
</s> add assert.NoError(t, err) </s> remove srv4.addLease(&leases[0])
</s> add err = srv4.addLease(&leases[0])
require.Nil(t, err) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/iprange_test.go |
wantOffset uint64 | <mask>
<mask> testCases := []struct {
<mask> name string
<mask> in net.IP
<mask> wantOffset uint
<mask> wantOK bool
<mask> }{{
<mask> name: "in",
<mask> in: net.IP{0, 0, 0, 2},
<mask> wantOffset: 1,
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove require.Nil(t, err)
</s> add require.NoError(t, err) </s> remove return lease
</s> add return l, nil </s> remove func (r *ipRange) offset(ip net.IP) (offset uint, ok bool) {
</s> add func (r *ipRange) offset(ip net.IP) (offset uint64, ok bool) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/iprange_test.go |
<mask> // ResetLeases - reset leases
<mask> ResetLeases(leases []*Lease)
<mask> // GetLeases - get leases
<mask> GetLeases(flags int) []Lease
<mask> // GetLeasesRef - get reference to leases array
<mask> GetLeasesRef() []*Lease
<mask> // AddStaticLease - add a static lease
<mask> AddStaticLease(lease Lease) error
<mask> // RemoveStaticLease - remove a static lease
<mask> RemoveStaticLease(l Lease) error
<mask> // FindMACbyIP - find a MAC address by IP address in the currently active DHCP leases
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // GetLeasesRef - get leases
func (s *v6Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v6Server) getLeasesRef() []*Lease { </s> remove s.leasesLock.Unlock()
</s> add </s> remove return result
</s> add return res </s> remove now := time.Now().Unix()
</s> add now := time.Now() </s> remove // GetLeasesRef - get leases
func (s *v4Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v4Server) getLeasesRef() []*Lease { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/server.go | |
getLeasesRef() []*Lease | <mask> // Stop - stop server
<mask> Stop()
<mask> }
<mask>
<mask> // V4ServerConf - server configuration
<mask> type V4ServerConf struct {
<mask> Enabled bool `yaml:"-" json:"-"`
<mask> InterfaceName string `yaml:"-" json:"-"`
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // Server calls this function when leases data changes
</s> add // notify is a way to signal to other components that leases have
// change. notify must be called outside of locked sections, since the
// clients might want to get the new data.
//
// TODO(a.garipov): This is utter madness and must be refactored. It
// just begs for deadlock bugs and other nastiness. </s> remove return lease
</s> add return l, nil </s> remove // GetLeasesRef - get leases
func (s *v4Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v4Server) getLeasesRef() []*Lease { </s> remove // GetLeasesRef - get reference to leases array
GetLeasesRef() []*Lease
</s> add </s> remove expiryStr = expiry.Format(time.RFC3339)
</s> add expiryStr = l.Expiry.Format(time.RFC3339) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/server.go |
// notify is a way to signal to other components that leases have
// change. notify must be called outside of locked sections, since the
// clients might want to get the new data.
//
// TODO(a.garipov): This is utter madness and must be refactored. It
// just begs for deadlock bugs and other nastiness. | <mask> routerIP net.IP // value for Option Router
<mask> subnetMask net.IPMask // value for Option SubnetMask
<mask> options []dhcpOption
<mask>
<mask> // Server calls this function when leases data changes
<mask> notify func(uint32)
<mask> }
<mask>
<mask> // V6ServerConf - server configuration
<mask> type V6ServerConf struct {
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // GetLeases returns the list of current DHCP leases (thread-safe)
func (s *v4Server) GetLeases(flags int) []Lease {
// The function shouldn't return nil value because zero-length slice
// behaves differently in cases like marshalling. Our front-end also
// requires non-nil value in the response.
result := []Lease{}
now := time.Now().Unix()
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v4Server) GetLeases(flags int) (res []Lease) {
// The function shouldn't return nil, because zero-length slice behaves
// differently in cases like marshalling. Our front-end also requires
// a non-nil value in the response.
res = []Lease{}
// TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
getDynamic := flags&LeasesDynamic != 0
getStatic := flags&LeasesStatic != 0 </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok </s> remove // GetLeasesRef - get leases
func (s *v4Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v4Server) getLeasesRef() []*Lease { </s> remove expiryStr = expiry.Format(time.RFC3339)
</s> add expiryStr = l.Expiry.Format(time.RFC3339) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/server.go |
"github.com/AdguardTeam/AdGuardHome/internal/agherr" | <mask> "time"
<mask>
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/go-ping/ping"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/insomniacslk/dhcp/dhcpv4/server4"
<mask> )
<mask>
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove "github.com/willf/bitset"
</s> add </s> remove if l.Expiry.Unix() != leaseExpireStatic && !s.conf.ipRange.contains(l.IP) {
log.Debug("dhcpv4: skipping a lease with ip %v: not within current ip range", l.IP)
</s> add if !l.IsStatic() && !r.contains(l.IP) {
log.Debug(
"dhcpv4: skipping lease %s (%s): not within current ip range",
l.IP,
l.HWAddr,
) </s> remove s.leasesLock.Lock()
err := s.rmDynamicLease(lease)
</s> add l.Expiry = time.Unix(leaseExpireStatic, 0)
// Perform the following actions in an anonymous function to make sure
// that the lock gets unlocked before the notification step.
func() {
s.leasesLock.Lock()
defer s.leasesLock.Unlock()
err = s.rmDynamicLease(&l)
if err != nil {
err = fmt.Errorf(
"removing dynamic leases for %s (%s): %w",
l.IP,
l.HWAddr,
err,
)
return
}
err = s.addLease(&l)
if err != nil {
err = fmt.Errorf("adding static lease for %s (%s): %w", l.IP, l.HWAddr, err)
return
}
}() </s> remove // addLease adds a lease.
func (s *v4Server) addLease(l *Lease) {
</s> add func (s *v4Server) addStaticLease(l *Lease) (err error) {
subnet := &net.IPNet{
IP: s.conf.routerIP,
Mask: s.conf.subnetMask,
}
if !subnet.Contains(l.IP) {
return fmt.Errorf("subnet %s does not contain the ip %q", subnet, l.IP)
}
s.leases = append(s.leases, l)
</s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
<mask> "github.com/AdguardTeam/golibs/log"
<mask> "github.com/go-ping/ping"
<mask> "github.com/insomniacslk/dhcp/dhcpv4"
<mask> "github.com/insomniacslk/dhcp/dhcpv4/server4"
<mask> "github.com/willf/bitset"
<mask> )
<mask>
<mask> // v4Server is a DHCPv4 server.
<mask> //
<mask> // TODO(a.garipov): Think about unifying this and v6Server.
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // Server calls this function when leases data changes
</s> add // notify is a way to signal to other components that leases have
// change. notify must be called outside of locked sections, since the
// clients might want to get the new data.
//
// TODO(a.garipov): This is utter madness and must be refactored. It
// just begs for deadlock bugs and other nastiness. </s> remove leasedOffsets *bitset.BitSet
</s> add leasedOffsets *bitSet </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go | |
leasedOffsets *bitSet | <mask> srv *server4.Server
<mask>
<mask> // leasedOffsets contains offsets from conf.ipRange.start that have been
<mask> // leased.
<mask> leasedOffsets *bitset.BitSet
<mask>
<mask> // leases contains all dynamic and static leases.
<mask> leases []*Lease
<mask>
<mask> // leasesLock protects leases and leasedOffsets.
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // Server calls this function when leases data changes
</s> add // notify is a way to signal to other components that leases have
// change. notify must be called outside of locked sections, since the
// clients might want to get the new data.
//
// TODO(a.garipov): This is utter madness and must be refactored. It
// just begs for deadlock bugs and other nastiness. </s> remove // GetLeasesRef - get reference to leases array
GetLeasesRef() []*Lease
</s> add </s> remove // GetLeasesRef - get leases
func (s *v6Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v6Server) getLeasesRef() []*Lease { </s> remove // GetLeasesRef - get leases
func (s *v4Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v4Server) getLeasesRef() []*Lease { </s> remove "github.com/willf/bitset"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
r := s.conf.ipRange | <mask> func (s *v4Server) ResetLeases(leases []*Lease) {
<mask> s.leases = nil
<mask>
<mask> for _, l := range leases {
<mask> if !l.IsStatic() && !r.contains(l.IP) {
<mask> log.Debug(
<mask> "dhcpv4: skipping lease %s (%s): not within current ip range",
<mask> l.IP,
<mask> l.HWAddr,
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if l.Expiry.Unix() != leaseExpireStatic && !s.conf.ipRange.contains(l.IP) {
log.Debug("dhcpv4: skipping a lease with ip %v: not within current ip range", l.IP)
</s> add if !l.IsStatic() && !r.contains(l.IP) {
log.Debug(
"dhcpv4: skipping lease %s (%s): not within current ip range",
l.IP,
l.HWAddr,
) </s> remove s.addLease(l)
</s> add err := s.addLease(l)
if err != nil {
// TODO(a.garipov): Better error handling.
log.Error("dhcpv4: adding a lease for %s (%s): %s", l.IP, l.HWAddr, err)
continue
} </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) </s> remove if !bytes.Equal(l.HWAddr, lease.HWAddr) ||
l.Hostname != lease.Hostname {
return fmt.Errorf("lease not found")
</s> add if !bytes.Equal(l.HWAddr, lease.HWAddr) || l.Hostname != lease.Hostname {
return fmt.Errorf("lease for ip %s is different: %+v", lease.IP, l) </s> remove // addLease adds a lease.
func (s *v4Server) addLease(l *Lease) {
</s> add func (s *v4Server) addStaticLease(l *Lease) (err error) {
subnet := &net.IPNet{
IP: s.conf.routerIP,
Mask: s.conf.subnetMask,
}
if !subnet.Contains(l.IP) {
return fmt.Errorf("subnet %s does not contain the ip %q", subnet, l.IP)
}
s.leases = append(s.leases, l)
| [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if !l.IsStatic() && !r.contains(l.IP) {
log.Debug(
"dhcpv4: skipping lease %s (%s): not within current ip range",
l.IP,
l.HWAddr,
) | <mask> func (s *v4Server) ResetLeases(leases []*Lease) {
<mask> s.leases = nil
<mask>
<mask> for _, l := range leases {
<mask> if l.Expiry.Unix() != leaseExpireStatic && !s.conf.ipRange.contains(l.IP) {
<mask> log.Debug("dhcpv4: skipping a lease with ip %v: not within current ip range", l.IP)
<mask>
<mask> continue
<mask> }
<mask>
<mask> s.addLease(l)
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove leases6 := s.srv6.GetLeasesRef()
</s> add leases6 := s.srv6.getLeasesRef() </s> remove if !bytes.Equal(l.HWAddr, lease.HWAddr) ||
l.Hostname != lease.Hostname {
return fmt.Errorf("lease not found")
</s> add if !bytes.Equal(l.HWAddr, lease.HWAddr) || l.Hostname != lease.Hostname {
return fmt.Errorf("lease for ip %s is different: %+v", lease.IP, l) </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
err := s.addLease(l)
if err != nil {
// TODO(a.garipov): Better error handling.
log.Error("dhcpv4: adding a lease for %s (%s): %s", l.IP, l.HWAddr, err)
continue
} | <mask>
<mask> continue
<mask> }
<mask>
<mask> s.addLease(l)
<mask> }
<mask> }
<mask>
<mask> // GetLeasesRef - get leases
<mask> func (s *v4Server) GetLeasesRef() []*Lease {
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // GetLeasesRef - get leases
func (s *v4Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v4Server) getLeasesRef() []*Lease { </s> remove // GetLeasesRef - get leases
func (s *v6Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v6Server) getLeasesRef() []*Lease { </s> remove // GetLeasesRef - get reference to leases array
GetLeasesRef() []*Lease
</s> add </s> remove s.addLease(l)
</s> add err = s.addLease(l)
if err != nil {
return nil, err
} </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
// getLeasesRef returns the actual leases slice. For internal use only.
func (s *v4Server) getLeasesRef() []*Lease { | <mask> s.addLease(l)
<mask> }
<mask> }
<mask>
<mask> // GetLeasesRef - get leases
<mask> func (s *v4Server) GetLeasesRef() []*Lease {
<mask> return s.leases
<mask> }
<mask>
<mask> // Return TRUE if this lease holds a blacklisted IP
<mask> func (s *v4Server) blacklisted(l *Lease) bool {
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok </s> remove s.addLease(l)
</s> add err := s.addLease(l)
if err != nil {
// TODO(a.garipov): Better error handling.
log.Error("dhcpv4: adding a lease for %s (%s): %s", l.IP, l.HWAddr, err)
continue
} </s> remove // GetLeasesRef - get leases
func (s *v6Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v6Server) getLeasesRef() []*Lease { </s> remove // GetLeasesRef - get reference to leases array
GetLeasesRef() []*Lease
</s> add </s> remove s.addLease(l)
</s> add err = s.addLease(l)
if err != nil {
return nil, err
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
// isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok | <mask> func (s *v4Server) GetLeasesRef() []*Lease {
<mask> return s.leases
<mask> }
<mask>
<mask> // Return TRUE if this lease holds a blacklisted IP
<mask> func (s *v4Server) blacklisted(l *Lease) bool {
<mask> return l.HWAddr.String() == "00:00:00:00:00:00"
<mask> }
<mask>
<mask> // GetLeases returns the list of current DHCP leases (thread-safe)
<mask> func (s *v4Server) GetLeases(flags int) []Lease {
<mask> // The function shouldn't return nil value because zero-length slice
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove // GetLeases returns the list of current DHCP leases (thread-safe)
func (s *v4Server) GetLeases(flags int) []Lease {
// The function shouldn't return nil value because zero-length slice
// behaves differently in cases like marshalling. Our front-end also
// requires non-nil value in the response.
result := []Lease{}
now := time.Now().Unix()
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v4Server) GetLeases(flags int) (res []Lease) {
// The function shouldn't return nil, because zero-length slice behaves
// differently in cases like marshalling. Our front-end also requires
// a non-nil value in the response.
res = []Lease{}
// TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
getDynamic := flags&LeasesDynamic != 0
getStatic := flags&LeasesStatic != 0 </s> remove // GetLeasesRef - get leases
func (s *v4Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v4Server) getLeasesRef() []*Lease { </s> remove // GetLeasesRef - get leases
func (s *v6Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v6Server) getLeasesRef() []*Lease { </s> remove func (s *winServer) GetLeasesRef() []*Lease { return nil }
</s> add func (s *winServer) getLeasesRef() []*Lease { return nil } </s> remove // GetLeasesRef - get reference to leases array
GetLeasesRef() []*Lease
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
// GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v4Server) GetLeases(flags int) (res []Lease) {
// The function shouldn't return nil, because zero-length slice behaves
// differently in cases like marshalling. Our front-end also requires
// a non-nil value in the response.
res = []Lease{}
// TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
getDynamic := flags&LeasesDynamic != 0
getStatic := flags&LeasesStatic != 0 | <mask> func (s *v4Server) blacklisted(l *Lease) bool {
<mask> return l.HWAddr.String() == "00:00:00:00:00:00"
<mask> }
<mask>
<mask> // GetLeases returns the list of current DHCP leases (thread-safe)
<mask> func (s *v4Server) GetLeases(flags int) []Lease {
<mask> // The function shouldn't return nil value because zero-length slice
<mask> // behaves differently in cases like marshalling. Our front-end also
<mask> // requires non-nil value in the response.
<mask> result := []Lease{}
<mask> now := time.Now().Unix()
<mask>
<mask> s.leasesLock.Lock()
<mask> for _, lease := range s.leases {
<mask> if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
<mask> ((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) </s> remove // Return TRUE if this lease holds a blacklisted IP
func (s *v4Server) blacklisted(l *Lease) bool {
return l.HWAddr.String() == "00:00:00:00:00:00"
</s> add // isBlocklisted returns true if this lease holds a blocklisted IP.
//
// TODO(a.garipov): Make a method of *Lease?
func (s *v4Server) isBlocklisted(l *Lease) (ok bool) {
if len(l.HWAddr) == 0 {
return false
}
ok = true
for _, b := range l.HWAddr {
if b != 0 {
ok = false
break
}
}
return ok </s> remove s.leasesLock.Unlock()
</s> add </s> remove if lease.Expiry.Unix() != leaseExpireStatic &&
lease.Expiry.Unix() <= now {
</s> add if !lease.IsStatic() && lease.Expiry.Before(now) { </s> remove now := time.Now().Unix()
</s> add now := time.Now() | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) | <mask> result := []Lease{}
<mask> now := time.Now().Unix()
<mask>
<mask> s.leasesLock.Lock()
<mask> for _, lease := range s.leases {
<mask> if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
<mask> ((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
<mask> result = append(result, *lease)
<mask> }
<mask> }
<mask> s.leasesLock.Unlock()
<mask>
<mask> return result
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove s.leasesLock.Unlock()
</s> add </s> remove // GetLeases returns the list of current DHCP leases (thread-safe)
func (s *v4Server) GetLeases(flags int) []Lease {
// The function shouldn't return nil value because zero-length slice
// behaves differently in cases like marshalling. Our front-end also
// requires non-nil value in the response.
result := []Lease{}
now := time.Now().Unix()
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v4Server) GetLeases(flags int) (res []Lease) {
// The function shouldn't return nil, because zero-length slice behaves
// differently in cases like marshalling. Our front-end also requires
// a non-nil value in the response.
res = []Lease{}
// TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
getDynamic := flags&LeasesDynamic != 0
getStatic := flags&LeasesStatic != 0 </s> remove if lease.Expiry.Unix() != leaseExpireStatic &&
lease.Expiry.Unix() <= now {
</s> add if !lease.IsStatic() && lease.Expiry.Before(now) { </s> remove now := time.Now().Unix()
</s> add now := time.Now() </s> remove unix := l.Expiry.Unix()
if unix > now || unix == leaseExpireStatic {
</s> add if l.Expiry.After(now) || l.IsStatic() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
<mask> ((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
<mask> result = append(result, *lease)
<mask> }
<mask> }
<mask> s.leasesLock.Unlock()
<mask>
<mask> return result
<mask> }
<mask>
<mask> // FindMACbyIP - find a MAC address by IP address in the currently active DHCP leases
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove return result
</s> add return res </s> remove // GetLeasesRef - get leases
func (s *v6Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v6Server) getLeasesRef() []*Lease { </s> remove now := time.Now().Unix()
</s> add now := time.Now() </s> remove // GetLeasesRef - get reference to leases array
GetLeasesRef() []*Lease
</s> add </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go | |
return res | <mask> }
<mask> }
<mask> s.leasesLock.Unlock()
<mask>
<mask> return result
<mask> }
<mask>
<mask> // FindMACbyIP - find a MAC address by IP address in the currently active DHCP leases
<mask> func (s *v4Server) FindMACbyIP(ip net.IP) net.HardwareAddr {
<mask> now := time.Now().Unix()
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove now := time.Now().Unix()
</s> add now := time.Now() </s> remove // GetLeasesRef - get leases
func (s *v6Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v6Server) getLeasesRef() []*Lease { </s> remove s.leasesLock.Unlock()
</s> add </s> remove // GetLeasesRef - get reference to leases array
GetLeasesRef() []*Lease
</s> add </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
now := time.Now() | <mask> }
<mask>
<mask> // FindMACbyIP - find a MAC address by IP address in the currently active DHCP leases
<mask> func (s *v4Server) FindMACbyIP(ip net.IP) net.HardwareAddr {
<mask> now := time.Now().Unix()
<mask>
<mask> s.leasesLock.Lock()
<mask> defer s.leasesLock.Unlock()
<mask>
<mask> ip4 := ip.To4()
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove return result
</s> add return res </s> remove // GetLeasesRef - get leases
func (s *v6Server) GetLeasesRef() []*Lease {
</s> add // getLeasesRef returns the actual leases slice. For internal use only.
func (s *v6Server) getLeasesRef() []*Lease { </s> remove s.leasesLock.Unlock()
</s> add </s> remove // GetLeasesRef - get reference to leases array
GetLeasesRef() []*Lease
</s> add </s> remove // GetLeases returns the list of current DHCP leases (thread-safe)
func (s *v4Server) GetLeases(flags int) []Lease {
// The function shouldn't return nil value because zero-length slice
// behaves differently in cases like marshalling. Our front-end also
// requires non-nil value in the response.
result := []Lease{}
now := time.Now().Unix()
</s> add // GetLeases returns the list of current DHCP leases. It is safe for concurrent
// use.
func (s *v4Server) GetLeases(flags int) (res []Lease) {
// The function shouldn't return nil, because zero-length slice behaves
// differently in cases like marshalling. Our front-end also requires
// a non-nil value in the response.
res = []Lease{}
// TODO(a.garipov): Remove the silly bit twiddling and make GetLeases
// accept booleans. Seriously, this doesn't even save stack space.
getDynamic := flags&LeasesDynamic != 0
getStatic := flags&LeasesStatic != 0 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
if l.Expiry.After(now) || l.IsStatic() { | <mask> }
<mask>
<mask> for _, l := range s.leases {
<mask> if l.IP.Equal(ip4) {
<mask> unix := l.Expiry.Unix()
<mask> if unix > now || unix == leaseExpireStatic {
<mask> return l.HWAddr
<mask> }
<mask> }
<mask> }
<mask> return nil
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove for _, lease := range s.leases {
if ((flags&LeasesDynamic) != 0 && lease.Expiry.Unix() > now && !s.blacklisted(lease)) ||
((flags&LeasesStatic) != 0 && lease.Expiry.Unix() == leaseExpireStatic) {
result = append(result, *lease)
</s> add defer s.leasesLock.Unlock()
now := time.Now()
for _, l := range s.leases {
if getDynamic && l.Expiry.After(now) && !s.isBlocklisted(l) {
res = append(res, *l)
continue
}
if getStatic && l.IsStatic() {
res = append(res, *l) </s> remove if lease.Expiry.Unix() != leaseExpireStatic &&
lease.Expiry.Unix() <= now {
</s> add if !lease.IsStatic() && lease.Expiry.Before(now) { </s> remove now := time.Now().Unix()
</s> add now := time.Now() </s> remove leases6 := s.srv6.GetLeasesRef()
</s> add leases6 := s.srv6.getLeasesRef() </s> remove if l.Expiry.Unix() == leaseExpireStatic {
</s> add if l.IsStatic() { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
s.leasedOffsets.set(offset, false) | <mask>
<mask> r := s.conf.ipRange
<mask> offset, ok := r.offset(l.IP)
<mask> if ok {
<mask> s.leasedOffsets.Clear(offset)
<mask> }
<mask>
<mask> log.Debug("dhcpv4: removed lease %s (%s)", l.IP, l.HWAddr)
<mask> }
<mask>
</s> Pull request: dhcpd: imp static lease validation
Closes #2838.
Updates #2834.
Squashed commit of the following:
commit 608dce28cf6bcbaf5a7f0bf499889ec25777e121
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Thu Mar 18 16:49:20 2021 +0300
dhcpd: fix windows; imp code
commit 5e56eebf6ab85ca5fd0a0278c312674d921a3077
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Mar 17 18:47:54 2021 +0300
dhcpd: imp static lease validation </s> remove if !ok {
// TODO(a.garipov): Better error handling.
log.Debug("dhcpv4: lease %s (%s) out of range, not adding", l.IP, l.HWAddr)
</s> add if ok {
s.leasedOffsets.set(offset, true)
} </s> remove return
</s> add return nil
}
func (s *v4Server) addDynamicLease(l *Lease) (err error) {
r := s.conf.ipRange
offset, ok := r.offset(l.IP)
if !ok {
return fmt.Errorf("lease %s (%s) out of range, not adding", l.IP, l.HWAddr) </s> remove // addLease adds a lease.
func (s *v4Server) addLease(l *Lease) {
</s> add func (s *v4Server) addStaticLease(l *Lease) (err error) {
subnet := &net.IPNet{
IP: s.conf.routerIP,
Mask: s.conf.subnetMask,
}
if !subnet.Contains(l.IP) {
return fmt.Errorf("subnet %s does not contain the ip %q", subnet, l.IP)
}
s.leases = append(s.leases, l)
</s> remove log.Debug("dhcpv4: added lease %s (%s)", l.IP, l.HWAddr)
</s> add return s.addDynamicLease(l) </s> remove s.leasedOffsets.Set(offset)
</s> add s.leasedOffsets.set(offset, true)
return nil
}
// addLease adds a dynamic or static lease.
func (s *v4Server) addLease(l *Lease) (err error) {
if l.IsStatic() {
return s.addStaticLease(l)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/AdguardTeam/AdGuardHome/commit/eb9526cc9295592b9063ae3e0f73c2dc1561a400 | internal/dhcpd/v4.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.