test: Catch naked returns and check for canonically named imports

This catches scenarios where we forgot to prefix the error with return.
One of our contributors occasionally made this typo, and since core go
vet didn't (surprisingly) catch it, we should add a test!

It also adds a simple check for import naming aliases. Expanding this
test to add other cases and check for differently named values might
make sense.
This commit is contained in:
James Shubin
2018-05-05 13:34:52 -04:00
parent d26a6de759
commit a407771eaf
3 changed files with 36 additions and 8 deletions

View File

@@ -25,7 +25,7 @@ import (
"github.com/purpleidea/mgmt/engine"
"github.com/purpleidea/mgmt/engine/graph/autoedge"
"github.com/purpleidea/mgmt/engine/util"
engineUtil "github.com/purpleidea/mgmt/engine/util"
"github.com/purpleidea/mgmt/pgraph"
)
@@ -118,13 +118,13 @@ func TestMiscEncodeDecode2(t *testing.T) {
return
}
b64, err := util.ResToB64(input)
b64, err := engineUtil.ResToB64(input)
if err != nil {
t.Errorf("Can't encode: %v", err)
return
}
output, err := util.B64ToRes(b64)
output, err := engineUtil.B64ToRes(b64)
if err != nil {
t.Errorf("Can't decode: %v", err)
return

View File

@@ -21,7 +21,7 @@ import (
"reflect"
"testing"
"github.com/purpleidea/mgmt/engine/util"
engineUtil "github.com/purpleidea/mgmt/engine/util"
)
func TestStructTagToFieldName0(t *testing.T) {
@@ -33,7 +33,7 @@ func TestStructTagToFieldName0(t *testing.T) {
Delta int `lang:"surprise"`
}
mapping, err := util.StructTagToFieldName(&TestStruct{})
mapping, err := engineUtil.StructTagToFieldName(&TestStruct{})
if err != nil {
t.Errorf("failed: %+v", err)
return
@@ -62,7 +62,7 @@ func TestLowerStructFieldNameToFieldName0(t *testing.T) {
Delta int
}
mapping, err := util.LowerStructFieldNameToFieldName(&TestStruct{})
mapping, err := engineUtil.LowerStructFieldNameToFieldName(&TestStruct{})
if err != nil {
t.Errorf("failed: %+v", err)
return
@@ -100,7 +100,7 @@ func TestLowerStructFieldNameToFieldName1(t *testing.T) {
Delta int
}
mapping, err := util.LowerStructFieldNameToFieldName(&TestStruct{})
mapping, err := engineUtil.LowerStructFieldNameToFieldName(&TestStruct{})
if err == nil {
t.Errorf("expected failure, but passed with: %+v", mapping)
return
@@ -108,7 +108,7 @@ func TestLowerStructFieldNameToFieldName1(t *testing.T) {
}
func TestLowerStructFieldNameToFieldName2(t *testing.T) {
mapping, err := util.LowerStructFieldNameToFieldName(&TestRes{})
mapping, err := engineUtil.LowerStructFieldNameToFieldName(&TestRes{})
if err != nil {
t.Errorf("failed: %+v", err)
return