From 172a0d8a0e1e05d0bc47df09d50fb8ef49529f5f Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 21 Jul 2019 06:05:19 +0200 Subject: *: added missing error checks in tests When we assign a value to err, make sure to also check for it being nil afterwards. If those were intentionally unchecked, we should remove the assignment in the first place. Those checks certainly never harm, but please review thoroughly and let me know. Signed-off-by: Christian Muehlhaeuser (cherry picked from commit 19d6f42a4d814a50bd262fbb69a9b670db9756a2) --- worktree_test.go | 1 + 1 file changed, 1 insertion(+) (limited to 'worktree_test.go') diff --git a/worktree_test.go b/worktree_test.go index 045a76d..1f87957 100644 --- a/worktree_test.go +++ b/worktree_test.go @@ -1675,6 +1675,7 @@ func (s *WorktreeSuite) TestClean(c *C) { // Status before cleaning. status, err := wt.Status() + c.Assert(err, IsNil) c.Assert(len(status), Equals, 2) err = wt.Clean(&CleanOptions{}) -- cgit From e5c9c0dd9ff1f42dcdaba7a51919cf43abdb79f9 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Sun, 21 Jul 2019 06:24:22 +0200 Subject: *: avoid unnecessary conversions No need to convert these values, they're already of the right type. Signed-off-by: Christian Muehlhaeuser (cherry picked from commit a1d8a7ac8bd0e4aff0f27dbb8bb37b8bd13a1346) --- worktree_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'worktree_test.go') diff --git a/worktree_test.go b/worktree_test.go index 1f87957..dab1c23 100644 --- a/worktree_test.go +++ b/worktree_test.go @@ -432,7 +432,7 @@ func (s *WorktreeSuite) TestFilenameNormalization(c *C) { err = w.Filesystem.Remove(filename) c.Assert(err, IsNil) - modFilename := norm.Form(norm.NFKD).String(filename) + modFilename := norm.NFKD.String(filename) writeFile(modFilename) _, err = w.Add(filename) -- cgit