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

Pull request: all: get rid of labels

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

Squashed commit of the following:

commit 5e3688ed92b0f76a47078a55bc22c401422c914c
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Dec 9 17:46:50 2021 +0300

    all: imp code, docs

commit 123d1ec52d0037315e8de94ab5a26b48cf0bf984
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Thu Dec 9 17:14:05 2021 +0300

    all: get rid of labels
This commit is contained in:
Eugene Burkov
2021-12-09 18:26:56 +03:00
parent 434032f8e3
commit 25fd34c514
3 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
internal/aghos/os_test.go
View File

@@ -63,7 +63,7 @@ func TestLargestLabeled(t *testing.T) {
r := bytes.NewReader(tc.data)
t.Run(tc.name, func(t *testing.T) {
pid, instNum, err := parsePSOutput(r, comm)
pid, instNum, err := parsePSOutput(r, comm, nil)
require.NoError(t, err)
assert.Equal(t, tc.wantPID, pid)
@@ -76,7 +76,7 @@ func TestLargestLabeled(t *testing.T) {
require.NoError(t, err)
target := &aghio.LimitReachedError{}
_, _, err = parsePSOutput(lr, "")
_, _, err = parsePSOutput(lr, "", nil)
require.ErrorAs(t, err, &target)
assert.EqualValues(t, 0, target.Limit)
@@ -89,7 +89,7 @@ func TestLargestLabeled(t *testing.T) {
`3` + comm + nl,
))
pid, instances, err := parsePSOutput(r, comm, 1, 3)
pid, instances, err := parsePSOutput(r, comm, []int{1, 3})
require.NoError(t, err)
assert.Equal(t, 2, pid)