Add --reorder flag.

This commit is contained in:
Jeffrey Regan
2019-06-11 11:02:29 -07:00
parent 15a77fd2bb
commit 0fa2d9c32c
12 changed files with 200 additions and 38 deletions

View File

@@ -186,6 +186,16 @@ func hint(a, b string) string {
func (th *KustTestHarness) AssertActualEqualsExpected(
m resmap.ResMap, expected string) {
th.assertActualEqualsExpected(m, expected, true)
}
func (th *KustTestHarness) AssertActualEqualsExpectedNoSort(
m resmap.ResMap, expected string) {
th.assertActualEqualsExpected(m, expected, false)
}
func (th *KustTestHarness) assertActualEqualsExpected(
m resmap.ResMap, expected string, doLegacySort bool) {
if m == nil {
th.t.Fatalf("Map should not be nil.")
}
@@ -194,8 +204,9 @@ func (th *KustTestHarness) AssertActualEqualsExpected(
if len(expected) > 0 && expected[0] == 10 {
expected = expected[1:]
}
// The tests currently expect a particular ordering.
builtin.NewPreferredOrderTransformerPlugin().Transform(m)
if doLegacySort {
builtin.NewLegacyOrderTransformerPlugin().Transform(m)
}
actual, err := m.AsYaml()
if err != nil {
th.t.Fatalf("Unexpected err: %v", err)