mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2024-11-26 06:55:48 +03:00
40614d9a7b
Merge in DNS/adguard-home from 2324-querylog-bug-fix to master
Closes #2324.
Squashed commit of the following:
commit fdd584a218e1edc3e45ab5b00ceed0a3be681e32
Merge: 8103f9e42 f2eda6d19
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 18 15:35:42 2020 +0300
Merge branch 'master' into 2324-querylog-bug-fix
commit 8103f9e42a398f43682ee30d09b3afdab0e9e177
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Wed Nov 18 14:28:29 2020 +0300
querylog: fix the file ordering bug
commit 2c4e8fcc5b8593be1614480508dfd600fc676e64
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 17 20:57:45 2020 +0300
querylog: wrap errors to clarify error trace
commit 3733062b494817696e4443f153774bb01cea1b06
Author: Eugene Burkov <e.burkov@adguard.com>
Date: Tue Nov 17 18:55:17 2020 +0300
querylog: fix logger output bug
78 lines
1.5 KiB
Go
78 lines
1.5 KiB
Go
package agherr
|
|
|
|
import (
|
|
"errors"
|
|
"fmt"
|
|
"testing"
|
|
|
|
"github.com/AdguardTeam/AdGuardHome/internal/testutil"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestMain(m *testing.M) {
|
|
testutil.DiscardLogOutput(m)
|
|
}
|
|
|
|
func TestError_Error(t *testing.T) {
|
|
testCases := []struct {
|
|
name string
|
|
want string
|
|
err error
|
|
}{{
|
|
name: "simple",
|
|
want: "a",
|
|
err: Many("a"),
|
|
}, {
|
|
name: "wrapping",
|
|
want: "a: b",
|
|
err: Many("a", errors.New("b")),
|
|
}, {
|
|
name: "wrapping several",
|
|
want: "a: b (hidden: c, d)",
|
|
err: Many("a", errors.New("b"), errors.New("c"), errors.New("d")),
|
|
}, {
|
|
name: "wrapping wrapper",
|
|
want: "a: b: c (hidden: d)",
|
|
err: Many("a", Many("b", errors.New("c"), errors.New("d"))),
|
|
}}
|
|
for _, tc := range testCases {
|
|
assert.Equal(t, tc.want, tc.err.Error(), tc.name)
|
|
}
|
|
}
|
|
|
|
func TestError_Unwrap(t *testing.T) {
|
|
const (
|
|
errSimple = iota
|
|
errWrapped
|
|
errNil
|
|
)
|
|
errs := []error{
|
|
errSimple: errors.New("a"),
|
|
errWrapped: fmt.Errorf("err: %w", errors.New("nested")),
|
|
errNil: nil,
|
|
}
|
|
testCases := []struct {
|
|
name string
|
|
want error
|
|
wrapped error
|
|
}{{
|
|
name: "simple",
|
|
want: errs[errSimple],
|
|
wrapped: Many("a", errs[errSimple]),
|
|
}, {
|
|
name: "nested",
|
|
want: errs[errWrapped],
|
|
wrapped: Many("b", errs[errWrapped]),
|
|
}, {
|
|
name: "nil passed",
|
|
want: errs[errNil],
|
|
wrapped: Many("c", errs[errNil]),
|
|
}, {
|
|
name: "nil not passed",
|
|
want: nil,
|
|
wrapped: Many("d"),
|
|
}}
|
|
for _, tc := range testCases {
|
|
assert.Equal(t, tc.want, errors.Unwrap(tc.wrapped), tc.name)
|
|
}
|
|
}
|