Skip to content

Commit

Permalink
fix tests
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Larsen <[email protected]>
  • Loading branch information
PaulSonOfLars committed Oct 18, 2024
1 parent efb245e commit d816680
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion reposerver/repository/repository.go
Original file line number Diff line number Diff line change
Expand Up @@ -2445,7 +2445,7 @@ func (s *Service) newHelmClientResolveRevision(repo *v1alpha1.Repository, revisi

version, err := versions.MaxVersion(revision, tags)
if err != nil {
return nil, "", fmt.Errorf("no version for constraints: %w", err)
return nil, "", fmt.Errorf("invalid revision: %w", err)
}

return helmClient, version.String(), nil
Expand Down
5 changes: 3 additions & 2 deletions reposerver/repository/repository_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ func newServiceWithMocks(t *testing.T, root string, signed bool) (*Service, *git
chart: {{Version: "1.0.0"}, {Version: version}},
oobChart: {{Version: "1.0.0"}, {Version: version}},
}}, nil)
helmClient.On("GetTags", mock.AnythingOfType("string"), mock.AnythingOfType("bool")).Return([]string{"1.0.0", version}, nil)
helmClient.On("ExtractChart", chart, version, "", false, int64(0), false).Return("./testdata/my-chart", io.NopCloser, nil)
helmClient.On("ExtractChart", oobChart, version, "", false, int64(0), false).Return("./testdata2/out-of-bounds-chart", io.NopCloser, nil)
helmClient.On("CleanChartCache", chart, version, "").Return(nil)
Expand Down Expand Up @@ -1835,11 +1836,11 @@ func TestService_newHelmClientResolveRevision(t *testing.T) {

t.Run("EmptyRevision", func(t *testing.T) {
_, _, err := service.newHelmClientResolveRevision(&argoappv1.Repository{}, "", "my-chart", true)
assert.EqualError(t, err, "no version for constraints: failed to determine semver constraint: improper constraint: ")
assert.EqualError(t, err, "invalid revision: failed to determine semver constraint: improper constraint: ")
})
t.Run("InvalidRevision", func(t *testing.T) {
_, _, err := service.newHelmClientResolveRevision(&argoappv1.Repository{}, "???", "my-chart", true)
assert.EqualError(t, err, "no version for constraints: failed to determine semver constraint: improper constraint: ???", true)
assert.EqualError(t, err, "invalid revision: failed to determine semver constraint: improper constraint: ???", true)
})
}

Expand Down

0 comments on commit d816680

Please sign in to comment.