From b03cc302630ead9afbce8c16c74bf2c29123c0c1 Mon Sep 17 00:00:00 2001 From: Cody Rose Date: Fri, 12 Jan 2024 09:39:48 -0500 Subject: [PATCH] Individuate archive tests #2293 --- pkg/handlers/archive_test.go | 56 +++++++++++++++++++----------------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/pkg/handlers/archive_test.go b/pkg/handlers/archive_test.go index fce7d138e860..de2ed3fbf1ae 100644 --- a/pkg/handlers/archive_test.go +++ b/pkg/handlers/archive_test.go @@ -76,36 +76,38 @@ func TestArchiveHandler(t *testing.T) { } for name, testCase := range tests { - resp, err := http.Get(testCase.archiveURL) - if err != nil || resp.StatusCode != http.StatusOK { - t.Error(err) - } - defer resp.Body.Close() + t.Run(name, func(t *testing.T) { + resp, err := http.Get(testCase.archiveURL) + if err != nil || resp.StatusCode != http.StatusOK { + t.Error(err) + } + defer resp.Body.Close() - archive := Archive{} - archive.New() + archive := Archive{} + archive.New() - newReader, err := diskbufferreader.New(resp.Body) - if err != nil { - t.Errorf("error creating reusable reader: %s", err) - } - archiveChan := archive.FromFile(logContext.Background(), newReader) - - count := 0 - re := regexp.MustCompile(testCase.matchString) - matched := false - for chunk := range archiveChan { - count++ - if re.Match(chunk) { - matched = true + newReader, err := diskbufferreader.New(resp.Body) + if err != nil { + t.Errorf("error creating reusable reader: %s", err) } - } - if !matched && len(testCase.matchString) > 0 { - t.Errorf("%s: Expected string not found in archive.", name) - } - if count != testCase.expectedChunks { - t.Errorf("%s: Unexpected number of chunks. Got %d, expected: %d", name, count, testCase.expectedChunks) - } + archiveChan := archive.FromFile(logContext.Background(), newReader) + + count := 0 + re := regexp.MustCompile(testCase.matchString) + matched := false + for chunk := range archiveChan { + count++ + if re.Match(chunk) { + matched = true + } + } + if !matched && len(testCase.matchString) > 0 { + t.Errorf("%s: Expected string not found in archive.", name) + } + if count != testCase.expectedChunks { + t.Errorf("%s: Unexpected number of chunks. Got %d, expected: %d", name, count, testCase.expectedChunks) + } + }) } }