VOL-1900 lint warning fixes ro_core
Change-Id: I5ce82f2d188d215ba9620d0923a1101ed4e5e4a8
diff --git a/ro_core/core/core_test.go b/ro_core/core/core_test.go
index 88bd561..d88a7de 100644
--- a/ro_core/core/core_test.go
+++ b/ro_core/core/core_test.go
@@ -19,15 +19,15 @@
"context"
"errors"
"fmt"
+ "testing"
+
"github.com/opencord/voltha-go/ro_core/config"
"github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
- grpcserver "github.com/opencord/voltha-lib-go/v2/pkg/grpc"
"github.com/opencord/voltha-lib-go/v2/pkg/log"
"github.com/opencord/voltha-lib-go/v2/pkg/mocks"
ic "github.com/opencord/voltha-protos/v2/go/inter_container"
"github.com/phayes/freeport"
"github.com/stretchr/testify/assert"
- "testing"
)
type roCore struct {
@@ -35,8 +35,6 @@
config *config.ROCoreFlags
halted bool
exitChannel chan int
- grpcServer *grpcserver.GrpcServer
- core *Core
//For test
receiverChannels []<-chan *ic.InterContainerMessage
}
@@ -62,7 +60,7 @@
return nil, errors.New("unsupported-kv-store")
}
-func MakeTestNewCore() (*config.ROCoreFlags, *roCore) {
+func makeTestNewCore() (*config.ROCoreFlags, *roCore) {
clientPort, err := freeport.GetFreePort()
if err == nil {
@@ -84,11 +82,8 @@
roC.kvClient = cli
return roCoreFlgs, roC
}
- if err != nil {
- etcdServer.Stop()
- log.Fatal("Failed to create an Etcd client")
- }
-
+ etcdServer.Stop()
+ log.Fatal("Failed to create an Etcd client")
}
}
return nil, nil
@@ -96,7 +91,7 @@
func TestNewCore(t *testing.T) {
- roCoreFlgs, roC := MakeTestNewCore()
+ roCoreFlgs, roC := makeTestNewCore()
assert.NotNil(t, roCoreFlgs)
assert.NotNil(t, roC)
core := NewCore("ro_core", roCoreFlgs, roC.kvClient)
@@ -107,7 +102,7 @@
var ctx context.Context
- roCoreFlgs, roC := MakeTestNewCore()
+ roCoreFlgs, roC := makeTestNewCore()
assert.NotNil(t, roCoreFlgs)
assert.NotNil(t, roC)
core := NewCore("ro_core", roCoreFlgs, roC.kvClient)