Skip to content

Commit faba385

Browse files
feat: singleTest mage target for each integration test package (#8691) (#8791)
* feat: support running a single test for serverless and resource leak integration tests * doc: update test-framework-dev-guide.md to include the latest mage targets (cherry picked from commit 2ec9992) Co-authored-by: Panos Koutsovasilis <panos.koutsovasilis@elastic.co>
1 parent 4e49dee commit faba385

File tree

2 files changed

+61
-31
lines changed

2 files changed

+61
-31
lines changed

docs/test-framework-dev-guide.md

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,41 @@ Go to https://docker-auth.elastic.co/ and authenticate with Okta to receive your
6464

6565
The test are run with mage using the `integration` namespace:
6666

67-
- `mage integration:test` to execute all tests under the `testing/integration`
67+
#### ESS oriented tests
68+
69+
- `mage integration:test` to execute all tests under the `testing/integration/ess`
6870
folder. All tests are executed on remote VMs, including those that set `Local: true`.
6971

7072
- `mage integration:local [testName|all]` to execute only those tests under the
71-
`testing/integration` folder that set `Local: true`. It'll run all the tests if
73+
`testing/integration/ess` folder that set `Local: true`. It'll run all the tests if
7274
`all` is passed as argument, or it'll pass `[testName]` to `go test` as
7375
`--run=[testName]`. These tests are executed on your local machine.
7476

75-
- `mage integration:single [testName]` to execute a single test under the `testing/integration` folder. Only the selected test will be executed on remote VMs.
77+
- `mage integration:single [testName]` to execute a single test under the `testing/integration/ess` folder. Only the selected test will be executed on remote VMs.
78+
79+
- `mage integration:matrix` to run all tests under the `testing/integration/ess` folder on the complete matrix of supported operating systems and architectures of the Elastic Agent.
80+
81+
#### Kubernetes oriented tests
82+
83+
- `mage integration:testKubernetes` to run kubernetes tests under the `testing/integration/k8s` folder for the default image on the default version of kubernetes (all previous commands will not run any kubernetes tests).
84+
85+
- `mage integration:testKubernetesMatrix` to run a matrix of kubernetes tests under the `testing/integration/k8s` folder for all image types and supported versions of kubernetes.
86+
87+
- `mage integration:testKubernetesSingle [testName|all]` to execute a single test under the `testing/integration/k8s` folder. Only the selected test will be executed.
88+
89+
#### Serverless oriented tests
90+
91+
- `mage integration:testServerless` to execute all tests under the `testing/integration/serverless` folder. All tests are executed on remote VMs, including those that set `Local: true`.
92+
93+
- `mage integration:testServerlessSingle [testName|all]` to execute a single test under the `testing/integration/serverless` folder. Only the selected test will be executed on remote VMs.
94+
95+
#### Resource leaks tests
7696

77-
- `mage integration:matrix` to run all tests on the complete matrix of supported operating systems and architectures of the Elastic Agent.
97+
- `mage integration:testForResourceLeaks` to execute all tests under the `testing/integration/leak` folder. All tests are executed on remote VMs.
7898

79-
- `mage integration:testKubernetes` to run kubernetes tests for the default image on the default version of kubernetes (all previous commands will not run any kubernetes tests).
99+
- `mage integration:testForResourceLeaksSingle [testName|all]` to execute a single test under the `testing/integration/leak` folder. Only the selected test will be executed on remote VMs.
80100

81-
- `mage integration:testKubernetesMatrix` to run a matrix of kubernetes tests for all image types and supported versions of kubernetes.
101+
You can list all available mage targets by running `mage -l`
82102

83103
#### Selecting specific platform
84104

magefile.go

Lines changed: 35 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2341,46 +2341,47 @@ func (Integration) Single(ctx context.Context, testName string) error {
23412341
}
23422342

23432343
// TestServerless runs the integration tests defined in testing/integration/serverless
2344-
func (Integration) TestServerless(ctx context.Context) error {
2344+
func (i Integration) TestServerless(ctx context.Context) error {
2345+
return i.testServerless(ctx, false, "")
2346+
}
2347+
2348+
// TestServerlessSingle runs a single integration test defined in testing/integration/serverless
2349+
func (i Integration) TestServerlessSingle(ctx context.Context, testName string) error {
2350+
return i.testServerless(ctx, false, testName)
2351+
}
2352+
2353+
func (i Integration) testServerless(ctx context.Context, matrix bool, testName string) error {
23452354
err := os.Setenv("STACK_PROVISIONER", "serverless")
23462355
if err != nil {
23472356
return fmt.Errorf("error setting serverless stack env var: %w", err)
23482357
}
23492358

2350-
return integRunner(ctx, "testing/integration/serverless", false, "")
2359+
return integRunner(ctx, "testing/integration/serverless", matrix, testName)
23512360
}
23522361

2353-
// TestKubernetes runs kubernetes integration tests
2354-
func (Integration) TestKubernetes(ctx context.Context) error {
2355-
mg.Deps(Integration.BuildKubernetesTestData)
2356-
// invoke integration tests
2357-
if err := os.Setenv("TEST_GROUPS", "kubernetes"); err != nil {
2358-
return err
2359-
}
2360-
2361-
return integRunner(ctx, "testing/integration/k8s", false, "")
2362+
// TestKubernetes runs the integration tests defined in testing/integration/k8s
2363+
func (i Integration) TestKubernetes(ctx context.Context) error {
2364+
return i.testKubernetes(ctx, false, "")
23622365
}
23632366

2364-
// TestKubernetesSingle runs single k8s integration test
2365-
func (Integration) TestKubernetesSingle(ctx context.Context, testName string) error {
2366-
mg.Deps(Integration.BuildKubernetesTestData)
2367-
// invoke integration tests
2368-
if err := os.Setenv("TEST_GROUPS", "kubernetes"); err != nil {
2369-
return err
2370-
}
2367+
// TestKubernetesSingle runs a single integration test defined in testing/integration/k8s
2368+
func (i Integration) TestKubernetesSingle(ctx context.Context, testName string) error {
2369+
return i.testKubernetes(ctx, false, testName)
2370+
}
23712371

2372-
return integRunner(ctx, "testing/integration/k8s", false, testName)
2372+
// TestKubernetesMatrix runs a matrix of integration tests defined in testing/integration/k8s
2373+
func (i Integration) TestKubernetesMatrix(ctx context.Context) error {
2374+
return i.testKubernetes(ctx, true, "")
23732375
}
23742376

2375-
// TestKubernetesMatrix runs a matrix of kubernetes integration tests
2376-
func (Integration) TestKubernetesMatrix(ctx context.Context) error {
2377+
func (i Integration) testKubernetes(ctx context.Context, matrix bool, testName string) error {
23772378
mg.Deps(Integration.BuildKubernetesTestData)
23782379
// invoke integration tests
23792380
if err := os.Setenv("TEST_GROUPS", "kubernetes"); err != nil {
23802381
return err
23812382
}
23822383

2383-
return integRunner(ctx, "testing/integration/k8s", true, "")
2384+
return integRunner(ctx, "testing/integration/k8s", matrix, testName)
23842385
}
23852386

23862387
// BuildKubernetesTestData builds the test data required to run k8s integration tests
@@ -2917,9 +2918,18 @@ func (Integration) TestBeatServerless(ctx context.Context, beatname string) erro
29172918
return integRunner(ctx, "testing/integration/beats/serverless", false, "TestBeatsServerless")
29182919
}
29192920

2920-
// TestForResourceLeaks runs tests that check for resource leaks
2921-
func (Integration) TestForResourceLeaks(ctx context.Context) error {
2922-
return integRunner(ctx, "testing/integration/leak", false, "TestLongRunningAgentForLeaks")
2921+
// TestForResourceLeaks runs the integration tests defined in testing/integration/leak
2922+
func (i Integration) TestForResourceLeaks(ctx context.Context) error {
2923+
return i.testForResourceLeaks(ctx, false, "")
2924+
}
2925+
2926+
// TestForResourceLeaksSingle runs a single integration test defined in testing/integration/leak
2927+
func (i Integration) TestForResourceLeaksSingle(ctx context.Context, testName string) error {
2928+
return i.testForResourceLeaks(ctx, false, testName)
2929+
}
2930+
2931+
func (i Integration) testForResourceLeaks(ctx context.Context, matrix bool, testName string) error {
2932+
return integRunner(ctx, "testing/integration/leak", matrix, testName)
29232933
}
29242934

29252935
// TestOnRemote shouldn't be called locally (called on remote host to perform testing)

0 commit comments

Comments
 (0)