Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion server/etcdserver/api/v2store/store_ttl_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func TestStoreUpdateDirTTL(t *testing.T) {
assert.False(t, e.Node.Dir)
assert.Equal(t, eidx, e.EtcdIndex)
e, _ = s.Get("/foo/bar", false, false)
assert.Equal(t, "", *e.Node.Value)
assert.Empty(t, *e.Node.Value)
assert.Equal(t, eidx, e.EtcdIndex)

fc.Advance(600 * time.Millisecond)
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/v2store_deprecation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ func assertSnapshotsMatch(t testing.TB, firstDataDir, secondDataDir string, patc
require.NoError(t, err)
assert.NotEmpty(t, firstFiles)
assert.NotEmpty(t, secondFiles)
assert.Equal(t, len(firstFiles), len(secondFiles))
assert.Len(t, secondFiles, len(firstFiles))
sort.Strings(firstFiles)
sort.Strings(secondFiles)
for i := 0; i < len(firstFiles); i++ {
Expand Down
4 changes: 2 additions & 2 deletions tools/etcd-dump-logs/etcd-dump-log_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ func TestEtcdDumpLogEntryType(t *testing.T) {
expected, err := os.ReadFile(path.Join(binDir, argtest.fileExpected))
require.NoError(t, err)

assert.EqualValues(t, string(expected), string(actual))
assert.Equal(t, string(expected), string(actual))
// The output files contains a lot of trailing whitespaces... difficult to diagnose without printing them explicitly.
// TODO(ptabor): Get rid of the whitespaces both in code and the test-files.
assert.EqualValues(t, strings.ReplaceAll(string(expected), " ", "_"), strings.ReplaceAll(string(actual), " ", "_"))
assert.Equal(t, strings.ReplaceAll(string(expected), " ", "_"), strings.ReplaceAll(string(actual), " ", "_"))
})
}
}
Expand Down