Skip to content

Commit 15663ac

Browse files
committed
Remove odd dependency
1 parent 488c81d commit 15663ac

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ require (
1616

1717
// requires for tests only
1818
require (
19-
github.com/google/go-cmp v0.6.0
2019
github.com/rekby/fixenv v0.6.1
2120
github.com/stretchr/testify v1.7.1
2221
go.uber.org/mock v0.4.0

tests/integration/topic_client_test.go

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@ import (
1212
"testing"
1313
"time"
1414

15-
"github.com/google/go-cmp/cmp"
16-
"github.com/google/go-cmp/cmp/cmpopts"
1715
"github.com/stretchr/testify/require"
1816
"google.golang.org/grpc"
1917

@@ -249,20 +247,27 @@ func TestDescribeTopicConsumer(t *testing.T) {
249247

250248
requireAndCleanSubset(&consumer.Consumer.Attributes, &expectedConsumerDesc.Consumer.Attributes)
251249

252-
ignoredFields := []cmp.Option{
253-
cmpopts.IgnoreFields(topictypes.PartitionStats{}, "LastWriteTime", "MaxWriteTimeLag"),
254-
cmpopts.IgnoreFields(topictypes.PartitionConsumerStats{}, "PartitionReadSessionCreateTime", "LastReadTime", "MaxReadTimeLag", "MaxWriteTimeLag"),
255-
}
256-
for _, p := range consumer.Partitions {
250+
for i := range consumer.Partitions {
251+
// Fields that are checked here are dynamic and they change with time, so we need to set them to expected values
252+
// to make the comparison possible.
253+
p := &consumer.Partitions[i]
254+
257255
require.NotNil(t, p.PartitionStats.LastWriteTime)
258256

257+
p.PartitionStats.LastWriteTime = expectedConsumerDesc.Partitions[i].PartitionStats.LastWriteTime
258+
p.PartitionStats.MaxWriteTimeLag = expectedConsumerDesc.Partitions[i].PartitionStats.MaxWriteTimeLag
259+
259260
require.NotNil(t, p.PartitionConsumerStats.LastReadTime)
260261
require.NotNil(t, p.PartitionConsumerStats.MaxReadTimeLag)
261262
require.NotNil(t, p.PartitionConsumerStats.MaxWriteTimeLag)
263+
264+
p.PartitionConsumerStats.PartitionReadSessionCreateTime = expectedConsumerDesc.Partitions[i].PartitionConsumerStats.PartitionReadSessionCreateTime
265+
p.PartitionConsumerStats.LastReadTime = expectedConsumerDesc.Partitions[i].PartitionConsumerStats.LastReadTime
266+
p.PartitionConsumerStats.MaxReadTimeLag = expectedConsumerDesc.Partitions[i].PartitionConsumerStats.MaxReadTimeLag
267+
p.PartitionConsumerStats.MaxWriteTimeLag = expectedConsumerDesc.Partitions[i].PartitionConsumerStats.MaxWriteTimeLag
262268
}
263-
if diff := cmp.Diff(expectedConsumerDesc, consumer, ignoredFields...); diff != "" {
264-
t.Errorf("Mismatch (-expected +actual):\n%s", diff)
265-
}
269+
270+
require.Equal(t, expectedConsumerDesc, consumer)
266271
}
267272

268273
func TestSchemeList(t *testing.T) {

0 commit comments

Comments
 (0)