From 05861ff90cfc855620d0dcbd1d6cc488ebf04880 Mon Sep 17 00:00:00 2001 From: apocelipes Date: Wed, 24 Jul 2024 10:47:14 +0000 Subject: os,path/filepath,testing: use slices to clean up tests Replace reflect.DeepEqual with slices.Equal which is much faster. Change-Id: I299db6f998738174983731f08c1021346b87dfaa GitHub-Last-Rev: 44ca9015d6af4e0fbe8d23c93b3f2da08a2d7728 GitHub-Pull-Request: golang/go#67613 Reviewed-on: https://go-review.googlesource.com/c/go/+/587938 Reviewed-by: Dmitri Shuralyov LUCI-TryBot-Result: Go LUCI Reviewed-by: Ian Lance Taylor Auto-Submit: Ian Lance Taylor --- src/testing/fstest/testfs.go | 3 +-- src/testing/sub_test.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/testing') diff --git a/src/testing/fstest/testfs.go b/src/testing/fstest/testfs.go index 080bcdd65f..76a2cff62d 100644 --- a/src/testing/fstest/testfs.go +++ b/src/testing/fstest/testfs.go @@ -11,7 +11,6 @@ import ( "io" "io/fs" "path" - "reflect" "slices" "strings" "testing/iotest" @@ -358,7 +357,7 @@ func (t *fsTester) checkGlob(dir string, list []fs.DirEntry) { t.errorf("%s: Glob(%#q): %w", dir, glob, err) return } - if reflect.DeepEqual(want, names) { + if slices.Equal(want, names) { return } diff --git a/src/testing/sub_test.go b/src/testing/sub_test.go index 1c23d054a0..90c2afe605 100644 --- a/src/testing/sub_test.go +++ b/src/testing/sub_test.go @@ -7,9 +7,9 @@ package testing import ( "bytes" "fmt" - "reflect" "regexp" "runtime" + "slices" "strings" "sync" "sync/atomic" @@ -886,7 +886,7 @@ func TestCleanup(t *T) { t.Cleanup(func() { cleanups = append(cleanups, 1) }) t.Cleanup(func() { cleanups = append(cleanups, 2) }) }) - if got, want := cleanups, []int{2, 1}; !reflect.DeepEqual(got, want) { + if got, want := cleanups, []int{2, 1}; !slices.Equal(got, want) { t.Errorf("unexpected cleanup record; got %v want %v", got, want) } } -- cgit v1.3