From 18ad83d43d6ef23a89eeebdb2e0b8e4d89d9c29e Mon Sep 17 00:00:00 2001
From: Martin Sehnoutka <msehnout@redhat.com>
Date: Mon, 17 Feb 2020 14:58:05 +0100
Subject: [PATCH] cmd/dnf-json-tests: use defer

---
 cmd/osbuild-dnf-json-tests/main.go | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/cmd/osbuild-dnf-json-tests/main.go b/cmd/osbuild-dnf-json-tests/main.go
index d56a26fc0..38261a12d 100644
--- a/cmd/osbuild-dnf-json-tests/main.go
+++ b/cmd/osbuild-dnf-json-tests/main.go
@@ -14,14 +14,16 @@ import (
 func main() {
 	// Tests that the package wrapping dnf-json works as expected
 	dir, err := setUpTemporaryRepository()
+	defer func(dir string) {
+		err := tearDownTemporaryRepository(dir)
+		if err != nil {
+			log.Print("Warning: failed to clean up temporary repository.")
+		}
+	}(dir)
 	if err != nil {
-		log.Fatal("Failed to set up temporary repository:", err)
+		log.Panic("Failed to set up temporary repository:", err)
 	}
 	TestFetchChecksum(false, dir)
-	err = tearDownTemporaryRepository(dir)
-	if err != nil {
-		log.Print("Warning: failed to clean up temporary repository.")
-	}
 }
 
 func setUpTemporaryRepository() (string, error) {
@@ -57,10 +59,12 @@ func TestFetchChecksum(quiet bool, dir string) {
 	}
 	c, err := repoCfg.FetchChecksum()
 	if err != nil {
-		log.Fatal("Failed to fetch checksum:", err)
+		log.Panic("Failed to fetch checksum:", err)
 	}
 	if c == "" {
-		log.Fatal("The checksum is empty")
+		log.Panic("The checksum is empty")
+	}
+	if !quiet {
+		log.Println("TestFetchChecksum: SUCCESS")
 	}
-	log.Println("SUCCESS")
 }