Skip to content

Commit

Permalink
tests: fix errcheck warnings
Browse files Browse the repository at this point in the history 
Fix a bunch of warnings like

	Error return value of `cmd.Process.Kill` is not checked (errcheck)

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
  • Loading branch information
@kolyshkin
kolyshkin committed Mar 1, 2022
1 parent f17fd9a commit 1d4a9e8
Show file tree
Hide file tree
Showing 7 changed files with 197 additions and 55 deletions.
13 changes: 10 additions & 3 deletions conn_test.go
View file
Expand Up @@ -633,9 +633,13 @@ func BenchmarkServeSameConnAsync(b *testing.B) {

func benchmarkServe(b *testing.B, srv, cli *Conn) {
var r int64
var err error

err := srv.Export(server{}, "/org/guelfey/DBus/Test", "org.guelfey.DBus.Test")
if err != nil {
b.Fatal(err)
}

dest := srv.Names()[0]
srv.Export(server{}, "/org/guelfey/DBus/Test", "org.guelfey.DBus.Test")
obj := cli.Object(dest, "/org/guelfey/DBus/Test")
b.StartTimer()
for i := 0; i < b.N; i++ {
Expand All @@ -651,7 +655,10 @@ func benchmarkServe(b *testing.B, srv, cli *Conn) {

func benchmarkServeAsync(b *testing.B, srv, cli *Conn) {
dest := srv.Names()[0]
srv.Export(server{}, "/org/guelfey/DBus/Test", "org.guelfey.DBus.Test")
err := srv.Export(server{}, "/org/guelfey/DBus/Test", "org.guelfey.DBus.Test")
if err != nil {
b.Fatal(err)
}
obj := cli.Object(dest, "/org/guelfey/DBus/Test")
c := make(chan *Call, 50)
done := make(chan struct{})
Expand Down
41 changes: 29 additions & 12 deletions encoder_test.go
View file
Expand Up @@ -42,7 +42,9 @@ func TestEncodeArrayOfMaps(t *testing.T) {
buf := new(bytes.Buffer)
fds := make([]int, 0)
enc := newEncoder(buf, order, fds)
enc.Encode(tt.vs...)
if err := enc.Encode(tt.vs...); err != nil {
t.Fatal(err)
}

dec := newDecoder(buf, order, enc.fds)
v, err := dec.Decode(SignatureOf(tt.vs...))
Expand Down Expand Up @@ -75,7 +77,9 @@ func TestEncodeMapStringInterface(t *testing.T) {
t.Fatal(err)
}
out := map[string]interface{}{}
Store(v, &out)
if err := Store(v, &out); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(out, val) {
t.Errorf("not equal: got '%v', want '%v'",
out, val)
Expand All @@ -101,7 +105,9 @@ func TestEncodeMapStringNamedInterface(t *testing.T) {
t.Fatal(err)
}
out := map[string]empty{}
Store(v, &out)
if err := Store(v, &out); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(out, val) {
t.Errorf("not equal: got '%v', want '%v'",
out, val)
Expand Down Expand Up @@ -156,7 +162,9 @@ func TestEncodeSliceInterface(t *testing.T) {
t.Fatal(err)
}
out := []interface{}{}
Store(v, &out)
if err := Store(v, &out); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(out, val) {
t.Errorf("not equal: got '%v', want '%v'",
out, val)
Expand All @@ -180,7 +188,9 @@ func TestEncodeSliceNamedInterface(t *testing.T) {
t.Fatal(err)
}
out := []empty{}
Store(v, &out)
if err := Store(v, &out); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(out, val) {
t.Errorf("not equal: got '%v', want '%v'",
out, val)
Expand All @@ -189,7 +199,8 @@ func TestEncodeSliceNamedInterface(t *testing.T) {

func TestEncodeNestedInterface(t *testing.T) {
val := map[string]interface{}{
"foo": []interface{}{"1", "2", "3", "5",
"foo": []interface{}{
"1", "2", "3", "5",
map[string]interface{}{
"bar": "baz",
},
Expand All @@ -214,7 +225,9 @@ func TestEncodeNestedInterface(t *testing.T) {
t.Fatal(err)
}
out := map[string]interface{}{}
Store(v, &out)
if err := Store(v, &out); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(out, val) {
t.Errorf("not equal: got '%#v', want '%#v'",
out, val)
Expand All @@ -238,7 +251,9 @@ func TestEncodeInt(t *testing.T) {
t.Fatal(err)
}
var out int
Store(v, &out)
if err := Store(v, &out); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(out, val) {
t.Errorf("not equal: got '%v', want '%v'",
out, val)
Expand Down Expand Up @@ -286,7 +301,9 @@ func TestEncodeUint(t *testing.T) {
t.Fatal(err)
}
var out uint
Store(v, &out)
if err := Store(v, &out); err != nil {
t.Fatal(err)
}
if !reflect.DeepEqual(out, val) {
t.Errorf("not equal: got '%v', want '%v'",
out, val)
Expand Down Expand Up @@ -347,7 +364,7 @@ func TestEncodeOfAssignableType(t *testing.T) {

func TestEncodeVariant(t *testing.T) {
var res map[ObjectPath]map[string]map[string]Variant
var src = map[ObjectPath]map[string]map[string]Variant{
src := map[ObjectPath]map[string]map[string]Variant{
ObjectPath("/foo/bar"): {
"foo": {
"bar": MakeVariant(10),
Expand Down Expand Up @@ -378,7 +395,7 @@ func TestEncodeVariant(t *testing.T) {

func TestEncodeVariantToList(t *testing.T) {
var res map[string]Variant
var src = map[string]interface{}{
src := map[string]interface{}{
"foo": []interface{}{"a", "b", "c"},
}
buf := new(bytes.Buffer)
Expand All @@ -404,7 +421,7 @@ func TestEncodeVariantToList(t *testing.T) {

func TestEncodeVariantToUint64(t *testing.T) {
var res map[string]Variant
var src = map[string]interface{}{
src := map[string]interface{}{
"foo": uint64(10),
}
buf := new(bytes.Buffer)
Expand Down

0 comments on commit 1d4a9e8

Please sign in to comment.