Skip to content

Commit

Permalink
style: fix go-lint errors in e2e tests
Browse files Browse the repository at this point in the history
Signed-off-by: Will Hegedus <[email protected]>
  • Loading branch information
wbh1 committed May 8, 2022
1 parent fcfcc9a commit fe72eb1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions test/e2e/compact_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -871,7 +871,7 @@ func TestCompactRoutePrefix(t *testing.T) {
e, err := e2e.NewDockerEnvironment(name)
testutil.Ok(t, err)
t.Cleanup(e2ethanos.CleanScenario(t, e))
routePrefix := "test"
routePrefix := t.Name()

dir := filepath.Join(e.SharedDir(), "tmp")
testutil.Ok(t, os.MkdirAll(dir, os.ModePerm))
Expand All @@ -886,7 +886,7 @@ func TestCompactRoutePrefix(t *testing.T) {
Config: e2ethanos.NewS3Config(bucket, m.InternalEndpoint("https"), e2ethanos.ContainerSharedDir),
}

c, err := e2ethanos.NewCompactor(e, "expect-to-halt", svcConfig, nil, "--web.external-prefix=test", "--web.route-prefix=test")
c, err := e2ethanos.NewCompactor(e, "expect-to-halt", svcConfig, nil, "--web.external-prefix="+routePrefix, "--web.route-prefix="+routePrefix)
testutil.Ok(t, err)

// Not using e2e.StartAndWaitReady(c) because the health check will fail since its path is not prefixed.
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -574,7 +574,7 @@ func TestRuleRoutePrefix(t *testing.T) {
testutil.Ok(t, err)
t.Cleanup(e2ethanos.CleanScenario(t, e))

routePrefix := "test"
routePrefix := t.Name()

r, err := e2ethanos.NewTSDBRuler(e, "1", "/tmp", routePrefix, []alert.AlertmanagerConfig{}, []httpconfig.Config{
{
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/store_gateway_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ func TestStoreGatewayRoutePrefix(t *testing.T) {
testutil.Ok(t, err)
t.Cleanup(e2ethanos.CleanScenario(t, e))

routePrefix := "test"
routePrefix := t.Name()

const bucket = "store_gateway_test"
m, err := e2ethanos.NewMinio(e, "thanos-minio", bucket)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/tools_bucket_web_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ func TestToolsBucketWebExternalPrefixAndRoutePrefix(t *testing.T) {
t.Cleanup(e2ethanos.CleanScenario(t, e))

externalPrefix := "testThanos"
routePrefix := "test"
routePrefix := t.Name()
const bucket = "toolsBucketWeb_test"
m, err := e2ethanos.NewMinio(e, "thanos", bucket)
testutil.Ok(t, err)
Expand Down

0 comments on commit fe72eb1

Please sign in to comment.