From f35a6a467f4c21bfdea2fd5e41398703a85f4c3e Mon Sep 17 00:00:00 2001 From: Harshvir Potpose Date: Tue, 23 Apr 2024 02:12:26 +0530 Subject: [PATCH] rm temp file from t.cleanup and use fmt.Sprintf insted of constants Signed-off-by: Harshvir Potpose --- cmd/jaeger/internal/integration/badger_test.go | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/cmd/jaeger/internal/integration/badger_test.go b/cmd/jaeger/internal/integration/badger_test.go index b714e14b84b..877fb79c0f1 100644 --- a/cmd/jaeger/internal/integration/badger_test.go +++ b/cmd/jaeger/internal/integration/badger_test.go @@ -4,6 +4,7 @@ package integration import ( + "fmt" "net/http" "os" "os/exec" @@ -17,11 +18,6 @@ import ( "github.com/jaegertracing/jaeger/plugin/storage/integration" ) -const ( - host = "0.0.0.0" - Addr = "http://" + host + ":" + storagecleaner.Port + storagecleaner.URL -) - type BadgerStorageIntegration struct { E2EStorageIntegration logger *zap.Logger @@ -35,6 +31,7 @@ func (s *BadgerStorageIntegration) initialize(t *testing.T) { } func (s *BadgerStorageIntegration) cleanUp(t *testing.T) { + Addr := fmt.Sprintf("http://%s:%s%s", "0.0.0.0", storagecleaner.Port, storagecleaner.URL) r, err := http.NewRequest(http.MethodPost, Addr, nil) require.NoError(t, err) @@ -63,7 +60,6 @@ func TestBadgerStorage(t *testing.T) { }, }, } - defer s.rmBadgerCleanerConfig(t) s.initialize(t) t.Cleanup(func() { s.e2eCleanUp(t) @@ -77,10 +73,8 @@ func createBadgerCleanerConfig(t *testing.T) string { require.NoError(t, err) tempFile := string(data) tempFile = strings.ReplaceAll(tempFile, "\n", "") + t.Cleanup(func() { + os.Remove(tempFile) + }) return tempFile } - -func (s *BadgerStorageIntegration) rmBadgerCleanerConfig(t *testing.T) { - err := os.Remove(s.ConfigFile) - require.NoError(t, err) -}