Merge pull request #9068 from hashicorp/restore-test-signature

restore prior signature of test helper so enterprise compiles
This commit is contained in:
Daniel Nephin 2020-10-29 15:22:30 -04:00 committed by GitHub
commit e14a9a725e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions

View File

@ -14,8 +14,8 @@ import (
"github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/sdk/testutil"
) )
func newStateStore() *state.Store { func newStateStore() (*state.Store, error) {
return state.NewStateStore(nil) return state.NewStateStore(nil), nil
} }
func TestUsageReporter_emitServiceUsage_OSS(t *testing.T) { func TestUsageReporter_emitServiceUsage_OSS(t *testing.T) {

View File

@ -62,7 +62,8 @@ func TestUsageReporter_Run_Nodes(t *testing.T) {
metrics.NewGlobal(cfg, sink) metrics.NewGlobal(cfg, sink)
mockStateProvider := &mockStateProvider{} mockStateProvider := &mockStateProvider{}
s := newStateStore() s, err := newStateStore()
require.NoError(t, err)
if tcase.modfiyStateStore != nil { if tcase.modfiyStateStore != nil {
tcase.modfiyStateStore(t, s) tcase.modfiyStateStore(t, s)
} }