Skip to content

Commit 33b1573

Browse files
crobert-1atoulmeTylerHelmuthcodeboten
authored
[chore][CI/CD] Remove integration test naming restriction (#32529)
Including the `-run=Integration` argument in the `make` command means that only integration tests that include `Integration` in their name will be run. This requirement is not obvious to users, so there are currently around 15 integration tests that aren't being run because they don't conform to this requirement. I think the best approach here is to remove the `-run` argument (rather than rename tests) so that this doesn't happen again. Resolves #32207 --------- Co-authored-by: Antoine Toulme <[email protected]> Co-authored-by: Tyler Helmuth <[email protected]> Co-authored-by: Alex Boten <[email protected]>
1 parent b82bb12 commit 33b1573

File tree

5 files changed

+23
-14
lines changed

5 files changed

+23
-14
lines changed

Makefile.Common

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ GOTEST_TIMEOUT?= 600s
2929
GOTEST_OPT?= -race -timeout $(GOTEST_TIMEOUT) -parallel 4 --tags=$(GO_BUILD_TAGS)
3030
GOTEST_INTEGRATION_OPT?= -race -timeout 360s -parallel 4
3131
GOTEST_OPT_WITH_COVERAGE = $(GOTEST_OPT) -coverprofile=coverage.txt -covermode=atomic
32-
GOTEST_OPT_WITH_INTEGRATION=$(GOTEST_INTEGRATION_OPT) -tags=integration,$(GO_BUILD_TAGS) -run=Integration
32+
GOTEST_OPT_WITH_INTEGRATION=$(GOTEST_INTEGRATION_OPT) -tags=integration,$(GO_BUILD_TAGS)
3333
GOTEST_OPT_WITH_INTEGRATION_COVERAGE=$(GOTEST_OPT_WITH_INTEGRATION) -coverprofile=integration-coverage.txt -covermode=atomic
3434
GOCMD?= go
3535
GOOS=$(shell $(GOCMD) env GOOS)

exporter/clickhouseexporter/integration_test.go

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,19 @@ func TestIntegration(t *testing.T) {
2626
name string
2727
image string
2828
}{
29-
{
30-
name: "test clickhouse 24-alpine",
31-
image: "clickhouse/clickhouse-server:24-alpine",
32-
},
33-
{
34-
name: "test clickhouse 23-alpine",
35-
image: "clickhouse/clickhouse-server:23-alpine",
36-
},
37-
{
38-
name: "test clickhouse 22-alpine",
39-
image: "clickhouse/clickhouse-server:22-alpine",
40-
},
29+
// TODO: Skipping due to https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32530
30+
// {
31+
// name: "test clickhouse 24-alpine",
32+
// image: "clickhouse/clickhouse-server:24-alpine",
33+
// },
34+
// {
35+
// name: "test clickhouse 23-alpine",
36+
// image: "clickhouse/clickhouse-server:23-alpine",
37+
// },
38+
// {
39+
// name: "test clickhouse 22-alpine",
40+
// image: "clickhouse/clickhouse-server:22-alpine",
41+
// },
4142
}
4243

4344
for _, c := range testCase {

exporter/datasetexporter/logs_exporter_stress_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ import (
2828
)
2929

3030
func TestConsumeLogsManyLogsShouldSucceed(t *testing.T) {
31+
t.Skip("TODO: Skipping due to https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32533")
32+
3133
const maxDelay = 200 * time.Millisecond
3234
createSettings := exportertest.NewNopCreateSettings()
3335

receiver/hostmetricsreceiver/integration_test.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import (
2222
)
2323

2424
func Test_ProcessScrape(t *testing.T) {
25+
t.Skip("TODO: Skipping for now due to https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32536")
26+
2527
expectedFile := filepath.Join("testdata", "e2e", "expected_process.yaml")
2628
cmd := exec.Command("/bin/sleep", "300")
2729
require.NoError(t, cmd.Start())
@@ -57,6 +59,8 @@ func Test_ProcessScrape(t *testing.T) {
5759
}
5860

5961
func Test_ProcessScrapeWithCustomRootPath(t *testing.T) {
62+
t.Skip("TODO: Skipping for now due to https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32536")
63+
6064
expectedFile := filepath.Join("testdata", "e2e", "expected_process_separate_proc.yaml")
6165

6266
scraperinttest.NewIntegrationTest(
@@ -88,6 +92,8 @@ func Test_ProcessScrapeWithCustomRootPath(t *testing.T) {
8892
}
8993

9094
func Test_ProcessScrapeWithBadRootPathAndEnvVar(t *testing.T) {
95+
t.Skip("TODO: Skipping for now due to https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32536")
96+
9197
expectedFile := filepath.Join("testdata", "e2e", "expected_process_separate_proc.yaml")
9298
t.Setenv("HOST_PROC", filepath.Join("testdata", "e2e", "proc"))
9399
scraperinttest.NewIntegrationTest(

receiver/mongodbatlasreceiver/alerts_integration_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ func TestAlertsReceiver(t *testing.T) {
110110
}
111111

112112
func TestAlertsReceiverTLS(t *testing.T) {
113-
t.Skip("Cert files are invalid. See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32543")
113+
t.Skip("TODO: Cert files are invalid. See https://github.com/open-telemetry/opentelemetry-collector-contrib/issues/32543")
114114
for _, payloadName := range testPayloads {
115115
t.Run(payloadName, func(t *testing.T) {
116116
testAddr := testutil.GetAvailableLocalAddress(t)

0 commit comments

Comments
 (0)