apptest: consistently use lib/fs.MustRemoveDir() instead of os.RemoveAll()

This reduces the amounts of bolierplate code needed for error handling
This commit is contained in:
Aliaksandr Valialkin
2025-07-25 20:28:50 +02:00
parent a092901e26
commit 90a84f2526
10 changed files with 36 additions and 34 deletions

View File

@@ -1,16 +1,17 @@
package tests
import (
"os"
"testing"
at "github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
at "github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
)
func TestSingleExportImportNative(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := at.NewTestCase(t)
defer tc.Stop()
@@ -21,7 +22,7 @@ func TestSingleExportImportNative(t *testing.T) {
}
func TestClusterExportImportNative(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := at.NewTestCase(t)
defer tc.Stop()

View File

@@ -1,18 +1,18 @@
package tests
import (
"os"
"testing"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
at "github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
pb "github.com/VictoriaMetrics/VictoriaMetrics/lib/prompbmarshal"
)
func TestSingleIngestionProtocols(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := at.NewTestCase(t)
defer tc.Stop()
sut := tc.MustStartDefaultVmsingle()
@@ -249,7 +249,7 @@ func TestSingleIngestionProtocols(t *testing.T) {
}
func TestClusterIngestionProtocols(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := at.NewTestCase(t)
defer tc.Stop()
vmstorage := tc.MustStartVmstorage("vmstorage", []string{

View File

@@ -2,7 +2,6 @@ package tests
import (
"fmt"
"os"
"strings"
"testing"
@@ -10,10 +9,11 @@ import (
"github.com/google/go-cmp/cmp/cmpopts"
at "github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
)
func TestSingleMetricNamesStats(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := at.NewTestCase(t)
defer tc.Stop()
sut := tc.MustStartVmsingle("vmsingle", []string{"-storage.trackMetricNamesStats=true", "-retentionPeriod=100y"})
@@ -136,8 +136,7 @@ func TestSingleMetricNamesStats(t *testing.T) {
}
func TestClusterMetricNamesStats(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := at.NewTestCase(t)
defer tc.Stop()

View File

@@ -1,17 +1,17 @@
package tests
import (
"os"
"testing"
"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
)
func TestClusterMultiTenantSelect(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
cmpOpt := cmpopts.IgnoreFields(apptest.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType")
cmpSROpt := cmpopts.IgnoreFields(apptest.PrometheusAPIV1SeriesResponse{}, "Status", "IsPartial")

View File

@@ -1,17 +1,17 @@
package tests
import (
"os"
"testing"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
)
func TestClusterMaxUniqueTimeseries(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
cmpOpt := cmpopts.IgnoreFields(apptest.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType")
@@ -121,7 +121,7 @@ func TestClusterMaxUniqueTimeseries(t *testing.T) {
}
func TestClusterMaxSeries(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
cmpSROpt := cmpopts.IgnoreFields(apptest.PrometheusAPIV1SeriesResponse{}, "Status", "IsPartial")

View File

@@ -1,17 +1,17 @@
package tests
import (
"os"
"testing"
"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
)
func TestClusterRollupResultCache(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
cmpOpt := cmpopts.IgnoreFields(apptest.PrometheusAPIV1QueryResponse{}, "Status", "Data.ResultType")

View File

@@ -1,20 +1,21 @@
package tests
import (
"os"
"path/filepath"
"testing"
at "github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
at "github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
)
// TestSingleSpecialQueryRegression is used to test queries that have experienced issues for specific data sets.
// These test cases were migrated from `app/victoria-metrics/main_test.go`.
// Most of these cases are based on user feedback. Refer to the corresponding GitHub issue for details on each case.
func TestSingleSpecialQueryRegression(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := at.NewTestCase(t)
defer tc.Stop()

View File

@@ -2,7 +2,6 @@ package tests
import (
"fmt"
"os"
"path/filepath"
"testing"
@@ -10,10 +9,11 @@ import (
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
)
func TestSingleToSingleVmctlNativeProtocol(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := apptest.NewTestCase(t)
defer tc.Stop()
@@ -44,7 +44,7 @@ func TestSingleToSingleVmctlNativeProtocol(t *testing.T) {
}
func TestClusterTenantsToTenantsVmctlNativeProtocol(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := apptest.NewTestCase(t)
defer tc.Stop()

View File

@@ -11,6 +11,7 @@ import (
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
)
const (
@@ -19,7 +20,7 @@ const (
)
func TestSingleVmctlPrometheusProtocol(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := apptest.NewTestCase(t)
defer tc.Stop()
@@ -37,7 +38,7 @@ func TestSingleVmctlPrometheusProtocol(t *testing.T) {
}
func TestClusterVmctlPrometheusProtocol(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := apptest.NewTestCase(t)
defer tc.Stop()

View File

@@ -2,7 +2,6 @@ package tests
import (
"fmt"
"os"
"testing"
"github.com/google/go-cmp/cmp"
@@ -10,10 +9,11 @@ import (
"github.com/prometheus/prometheus/prompb"
at "github.com/VictoriaMetrics/VictoriaMetrics/apptest"
"github.com/VictoriaMetrics/VictoriaMetrics/lib/fs"
)
func TestSingleVmctlRemoteReadProtocol(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := at.NewTestCase(t)
defer tc.Stop()
@@ -33,7 +33,7 @@ func TestSingleVmctlRemoteReadProtocol(t *testing.T) {
}
func TestSingleVmctlRemoteReadStreamProtocol(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := at.NewTestCase(t)
defer tc.Stop()
@@ -54,7 +54,7 @@ func TestSingleVmctlRemoteReadStreamProtocol(t *testing.T) {
}
func TestClusterVmctlRemoteReadProtocol(t *testing.T) {
os.RemoveAll(t.Name())
fs.MustRemoveDir(t.Name())
tc := at.NewTestCase(t)
defer tc.Stop()