fix tests

go.mod

@@ -117,7 +117,7 @@ require (
 	github.com/streadway/amqp v0.0.0-20180528204448-e5adc2ada8b8
 	github.com/stretchr/testify v1.5.1
 	github.com/tbrandon/mbserver v0.0.0-20170611213546-993e1772cc62
-	github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00 // indirect
+	github.com/tedsuo/ifrit v0.0.0-20191009134036-9a97d0632f00
 	github.com/tidwall/gjson v1.6.0
 	github.com/vishvananda/netlink v0.0.0-20171020171820-b2de5d10e38e // indirect
 	github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect

plugins/inputs/modbus_gateway/convert_test.go

@@ -69,7 +69,7 @@ func _assert(t *testing.T, order *CustomByteOrder, err error, success bool, expe
 		t.Errorf("Test %s (%s) expected 0x%08X, got 0x%08X", order.order, reflect.TypeOf(expected), expected, got)
 		t.Logf("  order should have been %v", order.positions)
 	} else {
-		t.Logf("Test %s (%s) PASSED", order.order, reflect.TypeOf(expected))
+		//t.Logf("Test %s (%s) PASSED", order.order, reflect.TypeOf(expected))
 	}
 
 }

plugins/inputs/modbus_gateway/gather.go

@@ -8,6 +8,7 @@ import (
 	"github.com/influxdata/telegraf/metric"
 	"github.com/prometheus/common/log"
 	"math"
+	"reflect"
 	"time"
 )
 
@@ -135,7 +136,7 @@ func scale(f *FieldDef, value interface{}) interface{} {
 			return nil
 		}
 
-	case "INT", "INT64":
+	case "INT", "INT32", "INT64":
 		switch v := value.(type) {
 		case int:
 			return int64(math.Round((float64(v) * f.Scale) + f.Offset))
@@ -151,7 +152,7 @@ func scale(f *FieldDef, value interface{}) interface{} {
 			return nil
 		}
 
-	case "UINT", "UINT64":
+	case "UINT", "UINT32", "UINT64":
 		switch v := value.(type) {
 		case int:
 			return uint64(math.Round((float64(v) * f.Scale) + f.Offset))
@@ -168,7 +169,7 @@ func scale(f *FieldDef, value interface{}) interface{} {
 		}
 
 	default:
-		log.Warn("Invalid output format")
+		log.Warnf("Invalid output format %s", reflect.TypeOf(value))
 		return nil
 	}
 }

plugins/inputs/modbus_gateway/modbus_gateway_test.go

@@ -16,31 +16,36 @@ func TestModbusGroupings(t *testing.T) {
 	g := metric.NewSeriesGrouper()
 
 	tm := time.Now()
-	r := Request{}
+
 	f1 := FieldDef{
 		Name:         "f1",
 		Scale:        1.0,
 		Offset:       0.0,
-		OutputFormat: "INT64",
+		OutputFormat: "UINT32",
 		Omit:         false,
 	}
 	f2 := FieldDef{
 		Name:         "f2",
 		Scale:        1.0,
 		Offset:       0.0,
-		OutputFormat: "FLOAT",
+		OutputFormat: "UINT32",
 		Omit:         false,
 	}
 
-	outputToGroup(g, &r, &f1, 1, tm)
-	outputToGroup(g, &r, &f2, 1, tm)
+	e := g.Add("m", nil, tm, f1.Name, scale(&f1, uint32(1)))
+	if e != nil {
+		t.Errorf("Could not add field %s", f1.Name)
+	}
+
+	e = g.Add("m", nil, tm, f2.Name, scale(&f2, uint32(1)))
+	if e != nil {
+		t.Errorf("Could not add field %s", f2.Name)
+	}
 
 	if len(g.Metrics()) != 1 {
 		t.Errorf("Grouping failed - should have generated 1 metric, but generated %d\n", len(g.Metrics()))
 	}
 
-	t.Logf("Metrics: %++v", g.Metrics())
-
 	firstMetric := g.Metrics()[0]
 
 	rf1, ok := firstMetric.GetField("f1")
@@ -49,7 +54,7 @@ func TestModbusGroupings(t *testing.T) {
 		return
 	}
 
-	_, ok = rf1.(int64)
+	_, ok = rf1.(uint64)
 	if !ok {
 		t.Errorf("Metric did not match field type specificier, type was %s", reflect.TypeOf(rf1))
 	}
@@ -60,7 +65,7 @@ func TestModbusGroupings(t *testing.T) {
 		return
 	}
 
-	_, ok = rf2.(float64)
+	_, ok = rf2.(uint64)
 	if !ok {
 		t.Errorf("Metric did not match field type specificier, type was %s", reflect.TypeOf(rf1))
 	}