From dde25b5983d8b948a16fc11ed5f67f5b3d17c751 Mon Sep 17 00:00:00 2001 From: aram price Date: Mon, 22 Jul 2024 14:19:40 -0700 Subject: [PATCH] check more errors in specs --- .../packagers/packager_utility_test.go | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/package_stemcell/packagers/packager_utility_test.go b/package_stemcell/packagers/packager_utility_test.go index 3fa097ed..f810898d 100644 --- a/package_stemcell/packagers/packager_utility_test.go +++ b/package_stemcell/packagers/packager_utility_test.go @@ -45,7 +45,8 @@ var _ = Describe("Packager Utility", func() { gzr, err := gzip.NewReader(fileReader) Expect(err).ToNot(HaveOccurred()) - defer gzr.Close() + defer func() { Expect(gzr.Close()).To(Succeed()) }() + tarReader := tar.NewReader(gzr) count := 0 for { @@ -64,13 +65,16 @@ var _ = Describe("Packager Utility", func() { } Expect(count).To(Equal(2)) - tarballFile, err := os.Open(tarball) //nolint:ineffassign,staticcheck - defer tarballFile.Close() //nolint:staticcheck + tarballFile, err := os.Open(tarball) + Expect(err).NotTo(HaveOccurred()) + defer func() { Expect(tarballFile.Close()).To(Succeed()) }() + expectedSha1 := sha1.New() - io.Copy(expectedSha1, tarballFile) //nolint:errcheck + _, err = io.Copy(expectedSha1, tarballFile) + Expect(err).NotTo(HaveOccurred()) - sum := fmt.Sprintf("%x", expectedSha1.Sum(nil)) - Expect(sha1Sum).To(Equal(sum)) + expectedSha1Sum := fmt.Sprintf("%x", expectedSha1.Sum(nil)) + Expect(sha1Sum).To(Equal(expectedSha1Sum)) }) })