upstream/helm
1
0
Fork 0
mirror of https://github.com/helm/helm.git synced 2026-04-21 14:17:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge pull request #9974 from viccuad/fix-win-resolver-test

Browse source 
test: Make internal/resolver/resolver_test.go pass on Win
This commit is contained in:
Martin Hickey 2021-07-27 10:39:46 +01:00 committed by GitHub
commit e9e6b07f62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
internal/resolver/resolver_test.go
View file

@ -16,6 +16,7 @@ limitations under the License.
package resolver
import (
"runtime"
"testing"
"helm.sh/helm/v3/pkg/chart"
@ -246,24 +247,28 @@ func TestGetLocalPath(t *testing.T) {
repo string
chartpath string
expect string
winExpect string
err bool
}{
{
name: "absolute path",
repo: "file:////tmp",
expect: "/tmp",
name: "absolute path",
repo: "file:////",
expect: "/",
winExpect: "\\",
},
{
name: "relative path",
repo: "file://../../testdata/chartpath/base",
chartpath: "foo/bar",
expect: "testdata/chartpath/base",
winExpect: "testdata\\chartpath\\base",
},
{
name: "current directory path",
repo: "../charts/localdependency",
chartpath: "testdata/chartpath/charts",
expect: "testdata/chartpath/charts/localdependency",
winExpect: "testdata\\chartpath\\charts\\localdependency",
},
{
name: "invalid local path",
@ -291,8 +296,12 @@ func TestGetLocalPath(t *testing.T) {
if tt.err {
t.Fatalf("Expected error in test %q", tt.name)
}
if p != tt.expect {
t.Errorf("%q: expected %q, got %q", tt.name, tt.expect, p)
expect := tt.expect
if runtime.GOOS == "windows" {
expect = tt.winExpect
}
if p != expect {
t.Errorf("%q: expected %q, got %q", tt.name, expect, p)
}
})
}