mirror of
https://github.com/coder/coder.git
synced 2026-09-24 15:04:27 +08:00
chore: bump github.com/stretchr/testify from 1.10.0 to 1.11.1 (#19599)
Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.10.0 to 1.11.1. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/stretchr/testify/releases">github.com/stretchr/testify's releases</a>.</em></p> <blockquote> <h2>v1.11.1</h2> <p>This release fixes <a href="https://redirect.github.com/stretchr/testify/issues/1785">#1785</a> introduced in v1.11.0 where expected argument values implementing the stringer interface (<code>String() string</code>) with a method which mutates their value, when passed to mock.Mock.On (<code>m.On("Method", <expected>).Return()</code>) or actual argument values passed to mock.Mock.Called may no longer match one another where they previously did match. The behaviour prior to v1.11.0 where the stringer is always called is restored. Future testify releases may not call the stringer method at all in this case.</p> <h2>What's Changed</h2> <ul> <li>Backport <a href="https://redirect.github.com/stretchr/testify/issues/1786">#1786</a> to release/1.11: mock: revert to pre-v1.11.0 argument matching behavior for mutating stringers by <a href="https://github.com/brackendawson"><code>@brackendawson</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1788">stretchr/testify#1788</a></li> </ul> <p><strong>Full Changelog</strong>: <a href="https://github.com/stretchr/testify/compare/v1.11.0...v1.11.1">https://github.com/stretchr/testify/compare/v1.11.0...v1.11.1</a></p> <h2>v1.11.0</h2> <h2>What's Changed</h2> <h3>Functional Changes</h3> <p>v1.11.0 Includes a number of performance improvements.</p> <ul> <li>Call stack perf change for CallerInfo by <a href="https://github.com/mikeauclair"><code>@mikeauclair</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1614">stretchr/testify#1614</a></li> <li>Lazily render mock diff output on successful match by <a href="https://github.com/mikeauclair"><code>@mikeauclair</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1615">stretchr/testify#1615</a></li> <li>assert: check early in Eventually, EventuallyWithT, and Never by <a href="https://github.com/cszczepaniak"><code>@cszczepaniak</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1427">stretchr/testify#1427</a></li> <li>assert: add IsNotType by <a href="https://github.com/bartventer"><code>@bartventer</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1730">stretchr/testify#1730</a></li> <li>assert.JSONEq: shortcut if same strings by <a href="https://github.com/dolmen"><code>@dolmen</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1754">stretchr/testify#1754</a></li> <li>assert.YAMLEq: shortcut if same strings by <a href="https://github.com/dolmen"><code>@dolmen</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1755">stretchr/testify#1755</a></li> <li>assert: faster and simpler isEmpty using reflect.Value.IsZero by <a href="https://github.com/dolmen"><code>@dolmen</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1761">stretchr/testify#1761</a></li> <li>suite: faster methods filtering (internal refactor) by <a href="https://github.com/dolmen"><code>@dolmen</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1758">stretchr/testify#1758</a></li> </ul> <h3>Fixes</h3> <ul> <li>assert.ErrorAs: log target type by <a href="https://github.com/craig65535"><code>@craig65535</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1345">stretchr/testify#1345</a></li> <li>Fix failure message formatting for Positive and Negative asserts in <a href="https://redirect.github.com/stretchr/testify/pull/1062">stretchr/testify#1062</a></li> <li>Improve ErrorIs message when error is nil but an error was expected by <a href="https://github.com/tsioftas"><code>@tsioftas</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1681">stretchr/testify#1681</a></li> <li>fix Subset/NotSubset when calling with mixed input types by <a href="https://github.com/siliconbrain"><code>@siliconbrain</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1729">stretchr/testify#1729</a></li> <li>Improve ErrorAs failure message when error is nil by <a href="https://github.com/ccoVeille"><code>@ccoVeille</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1734">stretchr/testify#1734</a></li> <li>mock.AssertNumberOfCalls: improve error msg by <a href="https://github.com/3scalation"><code>@3scalation</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1743">stretchr/testify#1743</a></li> </ul> <h3>Documentation, Build & CI</h3> <ul> <li>docs: Fix typo in README by <a href="https://github.com/alexandear"><code>@alexandear</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1688">stretchr/testify#1688</a></li> <li>Replace deprecated io/ioutil with io and os by <a href="https://github.com/alexandear"><code>@alexandear</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1684">stretchr/testify#1684</a></li> <li>Document consequences of calling t.FailNow() by <a href="https://github.com/greg0ire"><code>@greg0ire</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1710">stretchr/testify#1710</a></li> <li>chore: update docs for Unset <a href="https://redirect.github.com/stretchr/testify/issues/1621">#1621</a> by <a href="https://github.com/techfg"><code>@techfg</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1709">stretchr/testify#1709</a></li> <li>README: apply gofmt to examples by <a href="https://github.com/alexandear"><code>@alexandear</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1687">stretchr/testify#1687</a></li> <li>refactor: use %q and %T to simplify fmt.Sprintf by <a href="https://github.com/alexandear"><code>@alexandear</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1674">stretchr/testify#1674</a></li> <li>Propose Christophe Colombier (ccoVeille) as approver by <a href="https://github.com/brackendawson"><code>@brackendawson</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1716">stretchr/testify#1716</a></li> <li>Update documentation for the Error function in assert or require package by <a href="https://github.com/architagr"><code>@architagr</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1675">stretchr/testify#1675</a></li> <li>assert: remove deprecated build constraints by <a href="https://github.com/alexandear"><code>@alexandear</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1671">stretchr/testify#1671</a></li> <li>assert: apply gofumpt to internal test suite by <a href="https://github.com/ccoVeille"><code>@ccoVeille</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1739">stretchr/testify#1739</a></li> <li>CI: fix shebang in .ci.*.sh scripts by <a href="https://github.com/dolmen"><code>@dolmen</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1746">stretchr/testify#1746</a></li> <li>assert,require: enable parallel testing on (almost) all top tests by <a href="https://github.com/dolmen"><code>@dolmen</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1747">stretchr/testify#1747</a></li> <li>suite.Passed: add one more status test report by <a href="https://github.com/Ararsa-Derese"><code>@Ararsa-Derese</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1706">stretchr/testify#1706</a></li> <li>Add Helper() method in internal mocks and assert.CollectT by <a href="https://github.com/dolmen"><code>@dolmen</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1423">stretchr/testify#1423</a></li> <li>assert.Same/NotSame: improve usage of Sprintf by <a href="https://github.com/ccoVeille"><code>@ccoVeille</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1742">stretchr/testify#1742</a></li> <li>mock: enable parallel testing on internal testsuite by <a href="https://github.com/dolmen"><code>@dolmen</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1756">stretchr/testify#1756</a></li> <li>suite: cleanup use of 'testing' internals at runtime by <a href="https://github.com/dolmen"><code>@dolmen</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1751">stretchr/testify#1751</a></li> <li>assert: check test failure message for Empty and NotEmpty by <a href="https://github.com/ccoVeille"><code>@ccoVeille</code></a> in <a href="https://redirect.github.com/stretchr/testify/pull/1745">stretchr/testify#1745</a></li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/stretchr/testify/commit/2a57335dc9cd6833daa820bc94d9b40c26a7917d"><code>2a57335</code></a> Merge pull request <a href="https://redirect.github.com/stretchr/testify/issues/1788">#1788</a> from brackendawson/1785-backport-1.11</li> <li><a href="https://github.com/stretchr/testify/commit/af8c91234f184009f57ef29027b39ca89cb00100"><code>af8c912</code></a> Backport <a href="https://redirect.github.com/stretchr/testify/issues/1786">#1786</a> to release/1.11</li> <li><a href="https://github.com/stretchr/testify/commit/b7801fbf5cd58d201296d5d0e132d1849966dbd4"><code>b7801fb</code></a> Merge pull request <a href="https://redirect.github.com/stretchr/testify/issues/1778">#1778</a> from stretchr/dependabot/github_actions/actions/chec...</li> <li><a href="https://github.com/stretchr/testify/commit/69831f3b08c40d56a09d0be93e9d5ae034f1590b"><code>69831f3</code></a> build(deps): bump actions/checkout from 4 to 5</li> <li><a href="https://github.com/stretchr/testify/commit/a53be35c3b0cfcd5189cffcfd75df60ea581104c"><code>a53be35</code></a> Improve captureTestingT helper</li> <li><a href="https://github.com/stretchr/testify/commit/aafb604176db7e1f2c9810bc90d644291d057687"><code>aafb604</code></a> mock: improve formatting of error message</li> <li><a href="https://github.com/stretchr/testify/commit/7218e0390acd2aea3edb18574110ec2753c0aeef"><code>7218e03</code></a> improve error msg</li> <li><a href="https://github.com/stretchr/testify/commit/929a2126c2702df436312656a0304580b526c6e9"><code>929a212</code></a> Merge pull request <a href="https://redirect.github.com/stretchr/testify/issues/1758">#1758</a> from stretchr/dolmen/suite-faster-method-filtering</li> <li><a href="https://github.com/stretchr/testify/commit/bc7459ec38128532ff32f23cfab4ea0b725210f2"><code>bc7459e</code></a> suite: faster filtering of methods (-testify.m)</li> <li><a href="https://github.com/stretchr/testify/commit/7d37b5c962954410bcd7a71ff3a77c79514056d1"><code>7d37b5c</code></a> suite: refactor methodFilter</li> <li>Additional commits viewable in <a href="https://github.com/stretchr/testify/compare/v1.10.0...v1.11.1">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ethan Dickson <ethan@coder.com>
This commit is contained in:
co-authored by
Ethan Dickson
parent
a3b81761f1
commit
519812776e
@@ -261,20 +261,19 @@ func TestCache_BuildTime(t *testing.T) {
|
||||
wantTransition := codersdk.WorkspaceTransition(tt.args.transition)
|
||||
require.Eventuallyf(t, func() bool {
|
||||
stats := cache.TemplateBuildTimeStats(template.ID)
|
||||
return stats[wantTransition] != codersdk.TransitionStats{}
|
||||
ts := stats[wantTransition]
|
||||
return ts.P50 != nil && *ts.P50 == tt.want.buildTimeMs
|
||||
}, testutil.WaitLong, testutil.IntervalMedium,
|
||||
"BuildTime never populated",
|
||||
"P50 never reached expected value for %v", wantTransition,
|
||||
)
|
||||
|
||||
gotStats = cache.TemplateBuildTimeStats(template.ID)
|
||||
for transition, stats := range gotStats {
|
||||
gotStats := cache.TemplateBuildTimeStats(template.ID)
|
||||
for transition, ts := range gotStats {
|
||||
if transition == wantTransition {
|
||||
require.Equal(t, tt.want.buildTimeMs, *stats.P50)
|
||||
} else {
|
||||
require.Empty(
|
||||
t, stats, "%v", transition,
|
||||
)
|
||||
// Checked above
|
||||
continue
|
||||
}
|
||||
require.Empty(t, ts, "%v", transition)
|
||||
}
|
||||
} else {
|
||||
var stats codersdk.TemplateBuildTimeStats
|
||||
|
||||
@@ -194,15 +194,19 @@ func verifyCollectedMetrics(t *testing.T, expected []*agentproto.Stats_Metric, a
|
||||
|
||||
var d dto.Metric
|
||||
err := actual[i].Write(&d)
|
||||
require.NoError(t, err)
|
||||
assert.NoError(t, err)
|
||||
|
||||
switch e.Type {
|
||||
case agentproto.Stats_Metric_COUNTER:
|
||||
require.Equal(t, e.Value, d.Counter.GetValue())
|
||||
if e.Value != d.Counter.GetValue() {
|
||||
return false
|
||||
}
|
||||
case agentproto.Stats_Metric_GAUGE:
|
||||
require.Equal(t, e.Value, d.Gauge.GetValue())
|
||||
if e.Value != d.Gauge.GetValue() {
|
||||
return false
|
||||
}
|
||||
default:
|
||||
require.Failf(t, "unsupported type: %s", string(e.Type))
|
||||
assert.Failf(t, "unsupported type: %s", string(e.Type))
|
||||
}
|
||||
|
||||
expectedLabels := make([]*agentproto.Stats_Metric_Label, len(e.Labels))
|
||||
@@ -215,7 +219,7 @@ func verifyCollectedMetrics(t *testing.T, expected []*agentproto.Stats_Metric, a
|
||||
}
|
||||
sort.Slice(expectedLabels, sortFn)
|
||||
sort.Slice(dtoLabels, sortFn)
|
||||
require.Equal(t, expectedLabels, dtoLabels, d.String())
|
||||
assert.Equal(t, expectedLabels, dtoLabels, d.String())
|
||||
}
|
||||
return true
|
||||
}
|
||||
@@ -229,7 +233,7 @@ func prometheusMetricToString(t *testing.T, m prometheus.Metric) string {
|
||||
|
||||
var d dto.Metric
|
||||
err := m.Write(&d)
|
||||
require.NoError(t, err)
|
||||
assert.NoError(t, err)
|
||||
dtoLabels := asMetricAgentLabels(d.GetLabel())
|
||||
sort.Slice(dtoLabels, func(i, j int) bool {
|
||||
return dtoLabels[i].Name < dtoLabels[j].Name
|
||||
|
||||
@@ -175,7 +175,7 @@ require (
|
||||
github.com/spf13/afero v1.14.0
|
||||
github.com/spf13/pflag v1.0.6
|
||||
github.com/sqlc-dev/pqtype v0.3.0
|
||||
github.com/stretchr/testify v1.10.0
|
||||
github.com/stretchr/testify v1.11.1
|
||||
github.com/swaggo/http-swagger/v2 v2.0.1
|
||||
github.com/swaggo/swag v1.16.2
|
||||
github.com/tidwall/gjson v1.18.0
|
||||
|
||||
@@ -1769,8 +1769,8 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
|
||||
github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
|
||||
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
|
||||
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
|
||||
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
|
||||
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
||||
github.com/swaggest/assertjson v1.9.0 h1:dKu0BfJkIxv/xe//mkCrK5yZbs79jL7OVf9Ija7o2xQ=
|
||||
github.com/swaggest/assertjson v1.9.0/go.mod h1:b+ZKX2VRiUjxfUIal0HDN85W0nHPAYUbYH5WkkSsFsU=
|
||||
github.com/swaggo/files/v2 v2.0.0 h1:hmAt8Dkynw7Ssz46F6pn8ok6YmGZqHSVLZ+HQM7i0kw=
|
||||
|
||||
Reference in New Issue
Block a user