Skip to content

Commit 5a2dd73

Browse files
dependabot[bot]rturner3
dependabot[bot]
and
rturner3
authored
Bump github.com/stretchr/testify from 1.10.0 to 1.11.1 (#6270)
* Bump github.com/stretchr/testify from 1.10.0 to 1.11.0 Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.10.0 to 1.11.0. - [Release notes](https://github.com/stretchr/testify/releases) - [Commits](stretchr/testify@v1.10.0...v1.11.0) --- updated-dependencies: - dependency-name: github.com/stretchr/testify dependency-version: 1.11.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Fix unit tests that improperly use assert.Equal() A couple tests are using `assert.Equal()` inside a `require.Eventually()`. `assert.Equal()` will cause the test to fail if the assertion is not met. This conflicts with the intention of retrying the equality check in the test. These tests started failing due to a new behavior in `github.com/stretchr/testify` v1.11.0 that started executing the function passed to `require.Eventually()`/`assert.Eventually()` without any initial delay: stretchr/testify#1427 The tests were previously passing by chance due to the timing of how long `github.com/stretchr/testify` was waiting to try the function in `Eventually()` for the first time. Signed-off-by: Ryan Turner <[email protected]> * Fix other usages of Eventually() Signed-off-by: Ryan Turner <[email protected]> * Update to github.com/stretchr/testify v1.11.1 Signed-off-by: Ryan Turner <[email protected]> * Use EventuallyWithTf() Signed-off-by: Ryan Turner <[email protected]> * Use EventuallyWithTf() Signed-off-by: Ryan Turner <[email protected]> * go mod tidy Signed-off-by: Ryan Turner <[email protected]> * Fix other usages of Eventually() Signed-off-by: Ryan Turner <[email protected]> --------- Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Ryan Turner <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ryan Turner <[email protected]> Co-authored-by: Ryan Turner <[email protected]>
1 parent 9108e48 commit 5a2dd73

File tree

4 files changed

+50
-40
lines changed

4 files changed

+50
-40
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ require (
7474
github.com/spiffe/go-spiffe/v2 v2.6.0
7575
github.com/spiffe/spire-api-sdk v1.2.5-0.20250109200630-101d5e7de758
7676
github.com/spiffe/spire-plugin-sdk v1.4.4-0.20250606112051-68609d83ce7c
77-
github.com/stretchr/testify v1.10.0
77+
github.com/stretchr/testify v1.11.1
7878
github.com/uber-go/tally/v4 v4.1.17
7979
github.com/valyala/fastjson v1.6.4
8080
golang.org/x/crypto v0.41.0

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1713,8 +1713,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
17131713
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
17141714
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
17151715
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
1716-
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
1717-
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
1716+
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
1717+
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
17181718
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
17191719
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
17201720
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs=

‎pkg/server/datastore/sqlstore/sqlstore_test.go‎

Lines changed: 40 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1754,12 +1754,14 @@ func (s *PluginSuite) TestPruneAttestedNodeEvents() {
17541754
},
17551755
} {
17561756
s.T().Run(tt.name, func(t *testing.T) {
1757-
s.Require().Eventuallyf(func() bool {
1757+
s.Require().EventuallyWithTf(func(collect *assert.CollectT) {
17581758
err = s.ds.PruneAttestedNodeEvents(ctx, tt.olderThan)
1759-
s.Require().NoError(err)
1759+
require.NoError(t, err)
1760+
17601761
resp, err := s.ds.ListAttestedNodeEvents(ctx, &datastore.ListAttestedNodeEventsRequest{})
1761-
s.Require().NoError(err)
1762-
return reflect.DeepEqual(tt.expectedEvents, resp.Events)
1762+
require.NoError(t, err)
1763+
1764+
assert.True(collect, reflect.DeepEqual(tt.expectedEvents, resp.Events))
17631765
}, 10*time.Second, 50*time.Millisecond, "Failed to prune entries correctly")
17641766
})
17651767
}
@@ -1777,49 +1779,54 @@ func (s *PluginSuite) TestNodeSelectors() {
17771779
}
17781780

17791781
// assert there are no selectors for foo
1780-
selectors := s.getNodeSelectors("foo", datastore.RequireCurrent)
1782+
selectors := s.getNodeSelectors("foo")
17811783
s.Require().Empty(selectors)
1782-
s.Eventually(func() bool {
1783-
selectors = s.getNodeSelectors("foo", datastore.TolerateStale)
1784-
return len(selectors) == 0
1784+
s.EventuallyWithT(func(collect *assert.CollectT) {
1785+
selectors, err := s.ds.GetNodeSelectors(ctx, "foo", datastore.TolerateStale)
1786+
require.NoError(collect, err)
1787+
assert.Len(collect, selectors, 0)
17851788
}, time.Second, 10*time.Millisecond)
17861789

17871790
// set selectors on foo and bar
17881791
s.setNodeSelectors("foo", foo1)
17891792
s.setNodeSelectors("bar", bar)
17901793

17911794
// get foo selectors
1792-
selectors = s.getNodeSelectors("foo", datastore.RequireCurrent)
1795+
selectors = s.getNodeSelectors("foo")
17931796
s.RequireProtoListEqual(foo1, selectors)
1794-
s.Eventually(func() bool {
1795-
selectors := s.getNodeSelectors("foo", datastore.TolerateStale)
1796-
return spiretest.CheckProtoListEqual(s.T(), foo1, selectors)
1797+
s.EventuallyWithT(func(collect *assert.CollectT) {
1798+
selectors, err := s.ds.GetNodeSelectors(ctx, "foo", datastore.TolerateStale)
1799+
require.NoError(collect, err)
1800+
assert.True(collect, spiretest.CheckProtoListEqual(s.T(), foo1, selectors))
17971801
}, time.Second, 10*time.Millisecond)
17981802

17991803
// replace foo selectors
18001804
s.setNodeSelectors("foo", foo2)
1801-
selectors = s.getNodeSelectors("foo", datastore.RequireCurrent)
1805+
selectors = s.getNodeSelectors("foo")
18021806
s.RequireProtoListEqual(foo2, selectors)
1803-
s.Eventually(func() bool {
1804-
selectors := s.getNodeSelectors("foo", datastore.TolerateStale)
1805-
return spiretest.CheckProtoListEqual(s.T(), foo2, selectors)
1807+
s.EventuallyWithT(func(collect *assert.CollectT) {
1808+
selectors, err := s.ds.GetNodeSelectors(ctx, "foo", datastore.TolerateStale)
1809+
require.NoError(collect, err)
1810+
assert.True(collect, spiretest.CheckProtoListEqual(s.T(), foo2, selectors))
18061811
}, time.Second, 10*time.Millisecond)
18071812

18081813
// delete foo selectors
18091814
s.setNodeSelectors("foo", []*common.Selector{})
1810-
selectors = s.getNodeSelectors("foo", datastore.RequireCurrent)
1815+
selectors = s.getNodeSelectors("foo")
18111816
s.Require().Empty(selectors)
1812-
s.Eventually(func() bool {
1813-
selectors := s.getNodeSelectors("foo", datastore.TolerateStale)
1814-
return len(selectors) == 0
1817+
s.EventuallyWithT(func(collect *assert.CollectT) {
1818+
selectors, err := s.ds.GetNodeSelectors(ctx, "foo", datastore.TolerateStale)
1819+
require.NoError(collect, err)
1820+
assert.Len(collect, selectors, 0)
18151821
}, time.Second, 10*time.Millisecond)
18161822

18171823
// get bar selectors (make sure they weren't impacted by deleting foo)
1818-
selectors = s.getNodeSelectors("bar", datastore.RequireCurrent)
1824+
selectors = s.getNodeSelectors("bar")
18191825
s.RequireProtoListEqual(bar, selectors)
1820-
s.Eventually(func() bool {
1821-
selectors := s.getNodeSelectors("bar", datastore.TolerateStale)
1822-
return spiretest.CheckProtoListEqual(s.T(), bar, selectors)
1826+
s.EventuallyWithT(func(collect *assert.CollectT) {
1827+
selectors, err := s.ds.GetNodeSelectors(ctx, "bar", datastore.TolerateStale)
1828+
require.NoError(collect, err)
1829+
assert.True(collect, spiretest.CheckProtoListEqual(s.T(), bar, selectors))
18231830
}, time.Second, 10*time.Millisecond)
18241831
}
18251832

@@ -4395,12 +4402,14 @@ func (s *PluginSuite) TestPruneRegistrationEntryEvents() {
43954402
},
43964403
} {
43974404
s.T().Run(tt.name, func(t *testing.T) {
4398-
s.Require().Eventuallyf(func() bool {
4399-
err = s.ds.PruneRegistrationEntryEvents(ctx, tt.olderThan)
4400-
s.Require().NoError(err)
4405+
s.Require().EventuallyWithTf(func(collect *assert.CollectT) {
4406+
err := s.ds.PruneRegistrationEntryEvents(ctx, tt.olderThan)
4407+
require.NoError(collect, err)
4408+
44014409
resp, err := s.ds.ListRegistrationEntryEvents(ctx, &datastore.ListRegistrationEntryEventsRequest{})
4402-
s.Require().NoError(err)
4403-
return reflect.DeepEqual(tt.expectedEvents, resp.Events)
4410+
require.NoError(collect, err)
4411+
4412+
assert.True(collect, reflect.DeepEqual(tt.expectedEvents, resp.Events))
44044413
}, 10*time.Second, 50*time.Millisecond, "Failed to prune entries correctly")
44054414
})
44064415
}
@@ -5456,8 +5465,8 @@ func makeFederatedRegistrationEntry() *common.RegistrationEntry {
54565465
}
54575466
}
54585467

5459-
func (s *PluginSuite) getNodeSelectors(spiffeID string, dataConsistency datastore.DataConsistency) []*common.Selector {
5460-
selectors, err := s.ds.GetNodeSelectors(ctx, spiffeID, dataConsistency)
5468+
func (s *PluginSuite) getNodeSelectors(spiffeID string) []*common.Selector {
5469+
selectors, err := s.ds.GetNodeSelectors(ctx, spiffeID, datastore.RequireCurrent)
54615470
s.Require().NoError(err)
54625471
return selectors
54635472
}

‎pkg/server/plugin/notifier/k8sbundle/k8sbundle_test.go‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,10 +255,10 @@ kube_config_file_path = "/some/file/path"
255255
waitForInformerWatcher(t, test.webhookClient.watcherStarted)
256256
webhook := newMutatingWebhook(t, test.webhookClient.Interface, "spire-webhook", "")
257257

258-
require.Eventually(t, func() bool {
258+
require.EventuallyWithT(t, func(collect *assert.CollectT) {
259259
actualWebhook, err := test.webhookClient.Get(context.Background(), webhook.Namespace, webhook.Name)
260-
require.NoError(t, err)
261-
return assert.Equal(t, &admissionv1.MutatingWebhookConfiguration{
260+
require.NoError(collect, err)
261+
assert.Equal(collect, &admissionv1.MutatingWebhookConfiguration{
262262
ObjectMeta: metav1.ObjectMeta{
263263
Name: webhook.Name,
264264
ResourceVersion: "1",
@@ -287,10 +287,10 @@ kube_config_file_path = "/some/file/path"
287287
waitForInformerWatcher(t, test.apiServiceClient.watcherStarted)
288288
apiService := newAPIService(t, test.apiServiceClient.Interface, "spire-apiservice", "")
289289

290-
require.Eventually(t, func() bool {
290+
require.EventuallyWithT(t, func(collect *assert.CollectT) {
291291
actualAPIService, err := test.apiServiceClient.Get(context.Background(), apiService.Namespace, apiService.Name)
292-
require.NoError(t, err)
293-
return assert.Equal(t, &apiregistrationv1.APIService{
292+
require.NoError(collect, err)
293+
assert.Equal(collect, &apiregistrationv1.APIService{
294294
ObjectMeta: metav1.ObjectMeta{
295295
Name: apiService.Name,
296296
ResourceVersion: "1",
@@ -739,6 +739,7 @@ func (c *fakeKubeClient) Get(_ context.Context, namespace, configMap string) (ru
739739
}
740740
return entry, nil
741741
}
742+
742743
func (c *fakeKubeClient) GetList(context.Context) (runtime.Object, error) {
743744
list := c.getConfigMapList()
744745
if list.Items == nil {

0 commit comments

Comments
 (0)