Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Reactivate tests waiting for go-yaml/yaml/pull/690 #1351

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Reactivate tests waiting for go-yaml/yaml/pull/690 #1351

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4282e76
Reactivate tests waiting for #690
Ph0tonic Nov 14, 2023
19261e8
Merge branch 'main' into reactivate_test_690
Ph0tonic May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 4 additions & 8 deletions stores/yaml/store_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,19 @@ key4: *bar
var ALIASES_BRANCHES = sops.TreeBranches{
sops.TreeBranch{
sops.TreeItem{
Key: "key1",
Key: "key1",
Value: []interface{}{
"foo",
},
},
sops.TreeItem{
Key: "key2",
Key: "key2",
Value: []interface{}{
"foo",
},
},
sops.TreeItem{
Key: "key3",
Key: "key3",
Value: sops.TreeBranch{
sops.TreeItem{
Key: "foo",
Expand All @@ -87,7 +87,7 @@ var ALIASES_BRANCHES = sops.TreeBranches{
},
},
sops.TreeItem{
Key: "key4",
Key: "key4",
Value: sops.TreeBranch{
sops.TreeItem{
Key: "foo",
Expand Down Expand Up @@ -286,7 +286,6 @@ func TestComment3(t *testing.T) {
assert.Equal(t, COMMENT_3_OUT, bytes)
}

/* TODO: re-enable once https://github.com/go-yaml/yaml/pull/690 is merged
func TestComment4(t *testing.T) {
// First iteration: load and store
branches, err := (&Store{}).LoadPlainFile(COMMENT_4)
Expand All @@ -306,7 +305,6 @@ func TestComment5(t *testing.T) {
assert.Equal(t, string(COMMENT_5), string(bytes))
assert.Equal(t, COMMENT_5, bytes)
}
*/

func TestEmpty(t *testing.T) {
// First iteration: load and store
Expand All @@ -318,7 +316,6 @@ func TestEmpty(t *testing.T) {
assert.Equal(t, ``, string(bytes))
}

/* TODO: re-enable once https://github.com/go-yaml/yaml/pull/690 is merged
func TestEmpty2(t *testing.T) {
// First iteration: load and store
branches, err := (&Store{}).LoadPlainFile([]byte(`---`))
Expand All @@ -329,7 +326,6 @@ func TestEmpty2(t *testing.T) {
assert.Nil(t, err)
assert.Equal(t, ``, string(bytes))
}
*/

func TestEmpty3(t *testing.T) {
branches, err := (&Store{}).LoadPlainFile([]byte("{}\n"))
Expand Down