From 74d5622606eb013f1daae90c6320fd16cc3d930b Mon Sep 17 00:00:00 2001
From: Haleygo <hui.wang@daocloud.io>
Date: Thu, 10 Aug 2023 03:16:00 +0800
Subject: [PATCH] vmalert: fix redundant clean up move (#4803)
Follow-up after https://github.com/VictoriaMetrics/VictoriaMetrics/pull/4788/commits/55ae2c2d57b8f298b38edea346963492b0449396
---
app/vmalert/main_test.go | 2 +-
app/vmalert/notifier/config_watcher_test.go | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/app/vmalert/main_test.go b/app/vmalert/main_test.go
index 2c7e0254da..afa27bace3 100644
--- a/app/vmalert/main_test.go
+++ b/app/vmalert/main_test.go
@@ -87,10 +87,10 @@ groups:
)
f, err := os.CreateTemp("", "")
- defer os.Remove(f.Name())
if err != nil {
t.Fatal(err)
}
+ defer func() { _ = os.Remove(f.Name()) }()
writeToFile(t, f.Name(), rules1)
*configCheckInterval = 200 * time.Millisecond
diff --git a/app/vmalert/notifier/config_watcher_test.go b/app/vmalert/notifier/config_watcher_test.go
index 921f2c3da1..b51cd3bfa2 100644
--- a/app/vmalert/notifier/config_watcher_test.go
+++ b/app/vmalert/notifier/config_watcher_test.go
@@ -14,7 +14,6 @@ import (
func TestConfigWatcherReload(t *testing.T) {
f, err := os.CreateTemp("", "")
- defer os.Remove(f.Name())
if err != nil {
t.Fatal(err)
}
@@ -37,7 +36,6 @@ static_configs:
}
f2, err := os.CreateTemp("", "")
- defer os.Remove(f2.Name())
if err != nil {
t.Fatal(err)
}
@@ -65,7 +63,6 @@ func TestConfigWatcherStart(t *testing.T) {
defer consulSDServer.Close()
consulSDFile, err := os.CreateTemp("", "")
- defer os.Remove(consulSDFile.Name())
if err != nil {
t.Fatal(err)
}
@@ -112,7 +109,6 @@ func TestConfigWatcherReloadConcurrent(t *testing.T) {
defer consulSDServer2.Close()
consulSDFile, err := os.CreateTemp("", "")
- defer os.Remove(consulSDFile.Name())
if err != nil {
t.Fatal(err)
}
@@ -129,7 +125,6 @@ consul_sd_configs:
`, consulSDServer1.URL, consulSDServer2.URL))
staticAndConsulSDFile, err := os.CreateTemp("", "")
- defer os.Remove(staticAndConsulSDFile.Name())
if err != nil {
t.Fatal(err)
}