From 94dd53d009e93668506e196f80f4d756fd7d9f9b Mon Sep 17 00:00:00 2001
From: Matej Vasek <mvasek@redhat.com>
Date: Wed, 6 Apr 2022 23:59:44 +0200
Subject: [PATCH] Template generation improvements (#949)

* Improve test error output

Signed-off-by: Matej Vasek <mvasek@redhat.com>

* Template ZIP generator close file after use

Signed-off-by: Matej Vasek <mvasek@redhat.com>
---
 filesystem_test.go         | 9 +++------
 generate/templates/main.go | 1 +
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/filesystem_test.go b/filesystem_test.go
index 52f86289..72f8c94c 100644
--- a/filesystem_test.go
+++ b/filesystem_test.go
@@ -9,13 +9,13 @@ import (
 	"io/ioutil"
 	"os"
 	"path/filepath"
-	"reflect"
 	"runtime"
 	"sort"
 	"testing"
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
+	"github.com/google/go-cmp/cmp"
 )
 
 func TestFileSystems(t *testing.T) {
@@ -79,11 +79,8 @@ func TestFileSystems(t *testing.T) {
 			sort.Strings(embeddedFiles)
 			sort.Strings(localFiles)
 
-			if !reflect.DeepEqual(embeddedFiles, localFiles) {
-				t.Log("embedded files: ", embeddedFiles)
-				t.Log("local files: ", localFiles)
-				t.Error("content of embedded files doesn't match the filesystem")
-				return
+			if diff := cmp.Diff(localFiles, embeddedFiles); diff != "" {
+				t.Error("filesystem content missmatch (-want, +got):", diff)
 			}
 
 			err = fs.WalkDir(templatesFS, ".", func(path string, d fs.DirEntry, err error) error {
diff --git a/generate/templates/main.go b/generate/templates/main.go
index e01d94e4..ce7a40bb 100644
--- a/generate/templates/main.go
+++ b/generate/templates/main.go
@@ -71,6 +71,7 @@ func main() {
 			if err != nil {
 				return err
 			}
+			defer f.Close()
 
 			_, err = io.CopyBuffer(w, f, buff)
 			if err != nil {