fluxcd
/
source-controller
mirror of https://github.com/fluxcd/source-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

helm/repository: address invalid test 

Common mistake
(https://github.com/golang/go/wiki/CommonMistakes#using-goroutines-on-loop-iterator-variables),
but due to update now properly found by `go vet`.

In addition to making the test cases work in general.

Signed-off-by: Hidde Beydals <hidde@hhh.computer>
This commit is contained in:
Hidde Beydals 2023-03-02 15:34:45 +01:00
parent 459f266dd2
commit 9509b62f40
No known key found for this signature in database
GPG Key ID: 979F380FC2341744
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
internal/helm/repository/oci_chart_repository_test.go
View File

@ -210,7 +210,6 @@ func TestOCIChartRepository_Get(t *testing.T) {
} }
func TestOCIChartRepository_DownloadChart(t *testing.T) { func TestOCIChartRepository_DownloadChart(t *testing.T) {
client := &mockRegistryClient{}
testCases := []struct { testCases := []struct {
name string name string
url string url string
@ -225,7 +224,7 @@ func TestOCIChartRepository_DownloadChart(t *testing.T) {
Metadata: &chart.Metadata{Name: "chart"}, Metadata: &chart.Metadata{Name: "chart"},
URLs: []string{"oci://localhost:5000/my_repo/podinfo:1.0.0"}, URLs: []string{"oci://localhost:5000/my_repo/podinfo:1.0.0"},
}, },
expected: "oci://localhost:5000/my_repo/podinfo:1.0.0", expected: "localhost:5000/my_repo/podinfo:1.0.0",
}, },
{ {
name: "no chart URL", name: "no chart URL",
@ -245,19 +244,21 @@ func TestOCIChartRepository_DownloadChart(t *testing.T) {
} }
for _, tc := range testCases { for _, tc := range testCases {
tc := tc
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
g := NewWithT(t)
t.Parallel() t.Parallel()
mg := OCIMockGetter{}
g := NewWithT(t)
u, err := url.Parse(tc.url) u, err := url.Parse(tc.url)
g.Expect(err).ToNot(HaveOccurred()) g.Expect(err).ToNot(HaveOccurred())
mg := OCIMockGetter{}
r := OCIChartRepository{ r := OCIChartRepository{
Client: &mg, Client: &mg,
URL: *u, URL: *u,
} }
r.Client = &mg
g.Expect(err).ToNot(HaveOccurred())
g.Expect(r).ToNot(BeNil())
res, err := r.DownloadChart(tc.chartVersion) res, err := r.DownloadChart(tc.chartVersion)
if tc.expectedErr { if tc.expectedErr {
g.Expect(err).To(HaveOccurred()) g.Expect(err).To(HaveOccurred())
@ -265,7 +266,7 @@ func TestOCIChartRepository_DownloadChart(t *testing.T) {
} }
g.Expect(err).ToNot(HaveOccurred()) g.Expect(err).ToNot(HaveOccurred())
g.Expect(client.LastCalledURL).To(Equal(tc.expected)) g.Expect(mg.LastCalledURL).To(Equal(tc.expected))
g.Expect(res).ToNot(BeNil()) g.Expect(res).ToNot(BeNil())
g.Expect(err).ToNot(HaveOccurred()) g.Expect(err).ToNot(HaveOccurred())
}) })