[VOL-5567] Upgrade protos and remove deprecated dependencies
Change-Id: I699f46a8f3f6140431d7e813b6ae48f3db55f45c
Signed-off-by: bseeniva <balaji.seenivasan@radisys.com>
diff --git a/internal/pkg/controller/modmeter_test.go b/internal/pkg/controller/modmeter_test.go
index fb7df0f..23eb9aa 100644
--- a/internal/pkg/controller/modmeter_test.go
+++ b/internal/pkg/controller/modmeter_test.go
@@ -23,7 +23,8 @@
"voltha-go-controller/internal/pkg/of"
"voltha-go-controller/internal/test/mocks"
- "github.com/golang/mock/gomock"
+ "go.uber.org/mock/gomock"
+
"github.com/stretchr/testify/assert"
)
@@ -66,9 +67,10 @@
},
}
mmt.meter.ID = uint32(2)
- dbintf := mocks.NewMockDBIntf(gomock.NewController(t))
- db = dbintf
- dbintf.EXPECT().DelDeviceMeter(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()
+ // Avoid assigning a package-level mock DB here; it can be
+ // invoked by background goroutines from other tests after this
+ // test completes and cause a panic. The ModMeterTask path under
+ // test does not require DB interactions.
volthaClientMock.EXPECT().UpdateLogicalDeviceMeterTable(gomock.Any(), gomock.Any()).Return(nil, nil).AnyTimes()
err := mmt.Start(tt.args.ctx, tt.args.taskID)
assert.Nil(t, err)