Skip to content

Commit a533017

Browse files
authored
Merge pull request #999 from ydb-platform/switch-mock
switch mock to uber fork of gomock
2 parents 669aaf2 + 4257c72 commit a533017

14 files changed

+48
-31
lines changed

.github/workflows/check-codegen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Build
3333
run: |
3434
go install ./internal/cmd/gtrace
35-
go install github.com/golang/mock/mockgen@v1.6.0
35+
go install go.uber.org/mock/mockgen@892b665398ecece7c7a900d2a2f2fa3dac07e4c4
3636
3737
- name: Clean and re-generate *_gtrace.go files
3838
run: |

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515

1616
// requires for tests only
1717
require (
18-
github.com/golang/mock v1.6.0
18+
go.uber.org/mock v0.3.1-0.20231011042131-892b665398ec // indirect
1919
github.com/rekby/fixenv v0.3.2
2020
github.com/stretchr/testify v1.7.1
2121
)

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,8 @@ github.com/ydb-platform/ydb-go-genproto v0.0.0-20231215113745-46f6d30f974a h1:9w
7070
github.com/ydb-platform/ydb-go-genproto v0.0.0-20231215113745-46f6d30f974a/go.mod h1:Er+FePu1dNUieD+XTMDduGpQuCPssK5Q4BjF+IIXJ3I=
7171
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
7272
go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
73+
go.uber.org/mock v0.3.1-0.20231011042131-892b665398ec h1:aB0WVMCyiVcqL1yMRLM4htiFlMvgdOml97GYnw9su5Q=
74+
go.uber.org/mock v0.3.1-0.20231011042131-892b665398ec/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
7375
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
7476
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
7577
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

internal/topic/topicreaderinternal/batched_stream_reader_mock_test.go

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/topic/topicreaderinternal/message_content_pool_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"io"
77
"testing"
88

9-
"github.com/golang/mock/gomock"
109
"github.com/stretchr/testify/require"
10+
"go.uber.org/mock/gomock"
1111

1212
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xerrors"
1313
)

internal/topic/topicreaderinternal/pool_interface_mock_test.go

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/topic/topicreaderinternal/raw_topic_reader_stream_mock_test.go

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/topic/topicreaderinternal/reader_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ import (
66
"runtime"
77
"testing"
88

9-
"github.com/golang/mock/gomock"
109
"github.com/stretchr/testify/assert"
1110
"github.com/stretchr/testify/require"
11+
"go.uber.org/mock/gomock"
1212

1313
"github.com/ydb-platform/ydb-go-sdk/v3/internal/empty"
1414
"github.com/ydb-platform/ydb-go-sdk/v3/internal/xcontext"

internal/topic/topicreaderinternal/stream_reader_impl_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"testing"
1010
"time"
1111

12-
"github.com/golang/mock/gomock"
1312
"github.com/stretchr/testify/require"
13+
"go.uber.org/mock/gomock"
1414

1515
"github.com/ydb-platform/ydb-go-sdk/v3/internal/empty"
1616
"github.com/ydb-platform/ydb-go-sdk/v3/internal/grpcwrapper/rawtopic/rawtopiccommon"

internal/topic/topicreaderinternal/stream_reconnector_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"testing"
77
"time"
88

9-
"github.com/golang/mock/gomock"
109
"github.com/stretchr/testify/require"
10+
"go.uber.org/mock/gomock"
1111

1212
"github.com/ydb-platform/ydb-go-sdk/v3/internal/background"
1313
"github.com/ydb-platform/ydb-go-sdk/v3/internal/empty"

0 commit comments

Comments
 (0)