kubernetes-sigs/kustomize
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kustomize.git synced 2026-06-11 17:12:51 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

tests: make paths for x-plat friendly

Browse Source
This commit is contained in:
Ace Eldeib
2019-12-29 17:28:45 -08:00
parent e0f62c67f6
commit c4d3a2ff3f
2 changed files with 74 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
kyaml/copyutil/copyutil_test.go
View File

@@ -4,6 +4,7 @@
package copyutil_test package copyutil_test
import ( import (
"fmt"
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
@@ -104,7 +105,9 @@ func TestDiff_srcDestContentsDiffer(t *testing.T) {
diff, err := Diff(s, d) diff, err := Diff(s, d)
assert.NoError(t, err) assert.NoError(t, err)
assert.ElementsMatch(t, diff.List(), []string{"a1/f.yaml"}) assert.ElementsMatch(t, diff.List(), []string{
fmt.Sprintf("a1%sf.yaml", string(filepath.Separator)),
})
} }
// TestDiff_srcDestContentsDifferInDirs verifies if identical files // TestDiff_srcDestContentsDifferInDirs verifies if identical files
@@ -130,7 +133,11 @@ func TestDiff_srcDestContentsDifferInDirs(t *testing.T) {
diff, err := Diff(s, d) diff, err := Diff(s, d)
assert.NoError(t, err) assert.NoError(t, err)
assert.ElementsMatch(t, diff.List(), []string{ assert.ElementsMatch(t, diff.List(), []string{
"a1", "a1/f.yaml", "b1/f.yaml", "b1"}) "a1",
fmt.Sprintf("a1%sf.yaml", string(filepath.Separator)),
fmt.Sprintf("b1%sf.yaml", string(filepath.Separator)),
"b1",
})
} }
// TestDiff_skipGitSrc verifies that .git directories in the source // TestDiff_skipGitSrc verifies that .git directories in the source

118
kyaml/kio/pkgio_reader_test.go
View File

@@ -7,6 +7,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"path/filepath" "path/filepath"
"strings"
"testing" "testing"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
@@ -269,15 +270,15 @@ func TestLocalPackageReader_Read_nestedDirs(t *testing.T) {
metadata: metadata:
annotations: annotations:
config.kubernetes.io/index: '0' config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a/b' config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a/b/a_test.yaml' config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`, `,
`c: d # second `c: d # second
metadata: metadata:
annotations: annotations:
config.kubernetes.io/index: '1' config.kubernetes.io/index: '1'
config.kubernetes.io/package: 'a/b' config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a/b/a_test.yaml' config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`, `,
`# second thing `# second thing
e: f e: f
@@ -288,8 +289,8 @@ g:
metadata: metadata:
annotations: annotations:
config.kubernetes.io/index: '0' config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a/b' config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a/b/b_test.yaml' config.kubernetes.io/path: 'a${SEP}b${SEP}b_test.yaml'
`, `,
} }
for i := range nodes { for i := range nodes {
@@ -297,7 +298,8 @@ metadata:
if !assert.NoError(t, err) { if !assert.NoError(t, err) {
return return
} }
if !assert.Equal(t, expected[i], val) { want := strings.ReplaceAll(expected[i], "${SEP}", string(filepath.Separator))
if !assert.Equal(t, want, val) {
return return
} }
} }
@@ -321,25 +323,29 @@ func TestLocalPackageReader_Read_matchRegex(t *testing.T) {
assert.FailNow(t, "wrong number items") assert.FailNow(t, "wrong number items")
} }
val, err := nodes[0].String() expected := []string{
assert.NoError(t, err) `a: b #first
assert.Equal(t, `a: b #first
metadata: metadata:
annotations: annotations:
config.kubernetes.io/index: '0' config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a/b' config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a/b/a_test.yaml' config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`, val) `,
`c: d # second
val, err = nodes[1].String()
assert.NoError(t, err)
assert.Equal(t, `c: d # second
metadata: metadata:
annotations: annotations:
config.kubernetes.io/index: '1' config.kubernetes.io/index: '1'
config.kubernetes.io/package: 'a/b' config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a/b/a_test.yaml' config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`, val) `,
}
for i, node := range nodes {
val, err := node.String()
assert.NoError(t, err)
want := strings.ReplaceAll(expected[i], "${SEP}", string(filepath.Separator))
assert.Equal(t, want, val)
}
} }
func TestLocalPackageReader_Read_skipSubpackage(t *testing.T) { func TestLocalPackageReader_Read_skipSubpackage(t *testing.T) {
@@ -360,25 +366,29 @@ func TestLocalPackageReader_Read_skipSubpackage(t *testing.T) {
assert.FailNow(t, "wrong number items") assert.FailNow(t, "wrong number items")
} }
val, err := nodes[0].String() expected := []string{
assert.NoError(t, err) `a: b #first
assert.Equal(t, `a: b #first
metadata: metadata:
annotations: annotations:
config.kubernetes.io/index: '0' config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a/b' config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a/b/a_test.yaml' config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`, val) `,
`c: d # second
val, err = nodes[1].String()
assert.NoError(t, err)
assert.Equal(t, `c: d # second
metadata: metadata:
annotations: annotations:
config.kubernetes.io/index: '1' config.kubernetes.io/index: '1'
config.kubernetes.io/package: 'a/b' config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a/b/a_test.yaml' config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`, val) `,
}
for i, node := range nodes {
val, err := node.String()
assert.NoError(t, err)
want := strings.ReplaceAll(expected[i], "${SEP}", string(filepath.Separator))
assert.Equal(t, want, val)
}
} }
func TestLocalPackageReader_Read_includeSubpackage(t *testing.T) { func TestLocalPackageReader_Read_includeSubpackage(t *testing.T) {
@@ -398,29 +408,23 @@ func TestLocalPackageReader_Read_includeSubpackage(t *testing.T) {
if !assert.Len(t, nodes, 3) { if !assert.Len(t, nodes, 3) {
assert.FailNow(t, "wrong number items") assert.FailNow(t, "wrong number items")
} }
val, err := nodes[0].String()
assert.NoError(t, err) expected := []string{
assert.Equal(t, `a: b #first `a: b #first
metadata: metadata:
annotations: annotations:
config.kubernetes.io/index: '0' config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a/b' config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a/b/a_test.yaml' config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`, val) `,
`c: d # second
val, err = nodes[1].String()
assert.NoError(t, err)
assert.Equal(t, `c: d # second
metadata: metadata:
annotations: annotations:
config.kubernetes.io/index: '1' config.kubernetes.io/index: '1'
config.kubernetes.io/package: 'a/b' config.kubernetes.io/package: 'a${SEP}b'
config.kubernetes.io/path: 'a/b/a_test.yaml' config.kubernetes.io/path: 'a${SEP}b${SEP}a_test.yaml'
`, val) `,
`# second thing
val, err = nodes[2].String()
assert.NoError(t, err)
assert.Equal(t, `# second thing
e: f e: f
g: g:
h: h:
@@ -429,9 +433,17 @@ g:
metadata: metadata:
annotations: annotations:
config.kubernetes.io/index: '0' config.kubernetes.io/index: '0'
config.kubernetes.io/package: 'a/c' config.kubernetes.io/package: 'a${SEP}c'
config.kubernetes.io/path: 'a/c/c_test.yaml' config.kubernetes.io/path: 'a${SEP}c${SEP}c_test.yaml'
`, val) `,
}
for i, node := range nodes {
val, err := node.String()
assert.NoError(t, err)
want := strings.ReplaceAll(expected[i], "${SEP}", string(filepath.Separator))
assert.Equal(t, want, val)
}
} }
// func TestLocalPackageReaderWriter_DeleteFiles(t *testing.T) { // func TestLocalPackageReaderWriter_DeleteFiles(t *testing.T) {