DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix TestCleanTempNginxCfg

Browse source 
Signed-off-by: Mikhail Scherba <mikhail.scherba@flant.com>
This commit is contained in:
Mikhail Scherba 2023-12-23 10:12:01 +03:00
parent bc67504adb
commit 771faa105b
1 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
internal/ingress/controller/nginx_test.go
View file

@ -361,11 +361,11 @@ func TestCleanTempNginxCfg(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
tmpfile, err := os.CreateTemp("", tempNginxPattern) tmpfile1, err := os.CreateTemp(tmpDir, tempNginxPattern)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer tmpfile.Close() defer tmpfile1.Close()
dur, err := time.ParseDuration("-10m") dur, err := time.ParseDuration("-10m")
if err != nil { if err != nil {
@ -373,16 +373,16 @@ func TestCleanTempNginxCfg(t *testing.T) {
} }
oldTime := time.Now().Add(dur) oldTime := time.Now().Add(dur)
err = os.Chtimes(tmpfile.Name(), oldTime, oldTime) err = os.Chtimes(tmpfile1.Name(), oldTime, oldTime)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
tmpfile, err = os.CreateTemp("", tempNginxPattern) tmpfile2, err := os.CreateTemp(tmpDir, tempNginxPattern)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer tmpfile.Close() defer tmpfile2.Close()
err = cleanTempNginxCfg() err = cleanTempNginxCfg()
if err != nil { if err != nil {
@ -391,14 +391,17 @@ func TestCleanTempNginxCfg(t *testing.T) {
var files []string var files []string
err = filepath.Walk(os.TempDir(), func(path string, info os.FileInfo, _ error) error { err = filepath.Walk(tmpDir, func(path string, info os.FileInfo, err error) error {
if info.IsDir() && os.TempDir() != path { if info.IsDir() && tmpDir != path {
return filepath.SkipDir return filepath.SkipDir
} }
if strings.HasPrefix(info.Name(), tempNginxPattern) { if strings.HasPrefix(info.Name(), tempNginxPattern) {
switch path {
case tmpfile1.Name(), tmpfile2.Name():
files = append(files, path) files = append(files, path)
} }
}
return nil return nil
}) })
if err != nil { if err != nil {