From 755369df56994137d078c2ef149691b7d231c4df Mon Sep 17 00:00:00 2001 From: Giteabot Date: Wed, 27 Sep 2023 15:05:35 +0800 Subject: [PATCH] Fix yaml test (#27297) (#27303) Backport #27297 by @lunny Co-authored-by: Lunny Xiao --- models/fixture_generation.go | 4 +++- models/fixture_test.go | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/models/fixture_generation.go b/models/fixture_generation.go index abf880ee8e..d342919895 100644 --- a/models/fixture_generation.go +++ b/models/fixture_generation.go @@ -40,7 +40,9 @@ func GetYamlFixturesAccess() (string, error) { fmt.Fprintf(&b, " user_id: %d\n", a.UserID) fmt.Fprintf(&b, " repo_id: %d\n", a.RepoID) fmt.Fprintf(&b, " mode: %d\n", a.Mode) - fmt.Fprintf(&b, "\n") + if i < len(accesses)-1 { + fmt.Fprintf(&b, "\n") + } } return b.String(), nil diff --git a/models/fixture_test.go b/models/fixture_test.go index 8a28db8164..b70fdb536d 100644 --- a/models/fixture_test.go +++ b/models/fixture_test.go @@ -22,12 +22,13 @@ func TestFixtureGeneration(t *testing.T) { if !assert.NoError(t, err) { return } - bytes, err := os.ReadFile(filepath.Join(unittest.FixturesDir(), name+".yml")) + p := filepath.Join(unittest.FixturesDir(), name+".yml") + bytes, err := os.ReadFile(p) if !assert.NoError(t, err) { return } data := string(util.NormalizeEOL(bytes)) - assert.True(t, data == expected, "Differences detected for %s.yml", name) + assert.EqualValues(t, expected, data, "Differences detected for %s", p) } test(GetYamlFixturesAccess, "access")