From 003de3a80a286d0c9a94c12787c311620c5fa784 Mon Sep 17 00:00:00 2001
From: Petu Eusebiu <peusebiu@cisco.com>
Date: Wed, 13 Jul 2022 16:28:16 +0300
Subject: [PATCH] Fix config reloader in tests config file may get removed
before fsnotify starts watching it make sure the config file gets removed
when test ends, closes #608
Signed-off-by: Petu Eusebiu <peusebiu@cisco.com>
---
pkg/cli/extensions_test.go | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/pkg/cli/extensions_test.go b/pkg/cli/extensions_test.go
index e7a42baa..161c6cc1 100644
--- a/pkg/cli/extensions_test.go
+++ b/pkg/cli/extensions_test.go
@@ -608,22 +608,20 @@ func runCLIWithConfig(tempDir string, config string) (string, error) {
port := GetFreePort()
baseURL := GetBaseURL(port)
- logFile, err := ioutil.TempFile("", "zot-log*.txt")
+ logFile, err := ioutil.TempFile(tempDir, "zot-log*.txt")
if err != nil {
return "", err
}
defer os.Remove(logFile.Name()) // clean up
- cfgfile, err := ioutil.TempFile("", "zot-test*.json")
+ cfgfile, err := ioutil.TempFile(tempDir, "zot-test*.json")
if err != nil {
return "", err
}
config = fmt.Sprintf(config, tempDir, port, logFile.Name())
- defer os.Remove(cfgfile.Name()) // clean up
-
_, err = cfgfile.Write([]byte(config))
if err != nil {
return "", err