From 12eec2acaa783476802c488ef4dcbbce75ef8f74 Mon Sep 17 00:00:00 2001 From: Stephan Renatus Date: Mon, 15 Mar 2021 14:20:00 +0100 Subject: [PATCH] test/e2e: stop running benchmarks that output decision logs in GHA (#3273) If you want to run them, use `make perf-noisy`. Signed-off-by: Stephan Renatus --- Makefile | 4 ++++ .../logs/console/console_decision_logger_benchmark_test.go | 3 +++ test/e2e/logs/console/console_decision_logger_test.go | 6 ++---- .../logs/remote/remote_decision_logger_benchmark_test.go | 2 ++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index cdb0640bc7..d16dc2f010 100644 --- a/Makefile +++ b/Makefile @@ -109,6 +109,10 @@ test-coverage: generate perf: generate $(GO) test $(GO_TAGS),slow $(GO_TEST_TIMEOUT) -run=- -bench=. -benchmem ./... +.PHONY: perf-noisy +perf-noisy: generate + $(GO) test $(GO_TAGS),slow,noisy $(GO_TEST_TIMEOUT) -run=- -bench=. -benchmem ./... + .PHONY: wasm-sdk-e2e-test wasm-sdk-e2e-test: generate $(GO) test $(GO_TAGS),slow,wasm_sdk_e2e $(GO_TEST_TIMEOUT) -v ./internal/wasm/sdk/test/e2e diff --git a/test/e2e/logs/console/console_decision_logger_benchmark_test.go b/test/e2e/logs/console/console_decision_logger_benchmark_test.go index 6f9ba3c53b..0480969edf 100644 --- a/test/e2e/logs/console/console_decision_logger_benchmark_test.go +++ b/test/e2e/logs/console/console_decision_logger_benchmark_test.go @@ -1,6 +1,9 @@ // Copyright 2020 The OPA Authors. All rights reserved. // Use of this source code is governed by an Apache2 // license that can be found in the LICENSE file. + +// +build noisy + package console import ( diff --git a/test/e2e/logs/console/console_decision_logger_test.go b/test/e2e/logs/console/console_decision_logger_test.go index b6f8e47c3c..c4f52c4e36 100644 --- a/test/e2e/logs/console/console_decision_logger_test.go +++ b/test/e2e/logs/console/console_decision_logger_test.go @@ -11,13 +11,11 @@ import ( "strings" "testing" - "github.com/open-policy-agent/opa/plugins" - "github.com/open-policy-agent/opa/runtime" - "github.com/sirupsen/logrus" - "github.com/sirupsen/logrus/hooks/test" + "github.com/open-policy-agent/opa/plugins" + "github.com/open-policy-agent/opa/runtime" "github.com/open-policy-agent/opa/test/e2e" ) diff --git a/test/e2e/logs/remote/remote_decision_logger_benchmark_test.go b/test/e2e/logs/remote/remote_decision_logger_benchmark_test.go index af9c53a7c7..c64f2d9edb 100644 --- a/test/e2e/logs/remote/remote_decision_logger_benchmark_test.go +++ b/test/e2e/logs/remote/remote_decision_logger_benchmark_test.go @@ -2,6 +2,8 @@ // Use of this source code is governed by an Apache2 // license that can be found in the LICENSE file. +// +build noisy + package remote import (