From ad26075e989de81df61ec9f2eabce2bbc00a4896 Mon Sep 17 00:00:00 2001 From: lipsill <39668292+lipsill@users.noreply.github.com> Date: Tue, 16 Oct 2018 13:47:21 +0200 Subject: [PATCH 1/2] TESTING.asciidoc fix examples using forbidden annotation Clean up examples not to use forbidden test annotation `@Nightly`. --- TESTING.asciidoc | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/TESTING.asciidoc b/TESTING.asciidoc index d16d85b2ee18a..2a98d8d2cecab 100644 --- a/TESTING.asciidoc +++ b/TESTING.asciidoc @@ -91,7 +91,6 @@ Run any test methods that contain 'esi' (like: ...r*esi*ze...). You can also filter tests by certain annotations ie: - * `@Nightly` - tests that only run in nightly builds (disabled by default) * `@Backwards` - backwards compatibility tests (disabled by default) * `@AwaitsFix` - tests that are waiting for a bugfix (disabled by default) * `@BadApple` - tests that are known to fail randomly (disabled by default) @@ -99,15 +98,15 @@ You can also filter tests by certain annotations ie: Those annotation names can be combined into a filter expression like: ------------------------------------------------ -./gradlew test -Dtests.filter="@nightly and not @backwards" +./gradlew test -Dtests.filter="@awaitsfix and not @backwards" ------------------------------------------------ -to run all nightly test but not the ones that are backwards tests. `tests.filter` supports -the boolean operators `and, or, not` and grouping ie: +to run all tests waiting for a bug fix but not the ones that are backwards tests. +`tests.filter` supports the boolean operators `and, or, not` and grouping ie: --------------------------------------------------------------- -./gradlew test -Dtests.filter="@nightly and not(@badapple or @backwards)" +./gradlew test -Dtests.filter="@awaitsfix and not(@badapple or @backwards)" --------------------------------------------------------------- === Seed and repetitions. @@ -160,7 +159,6 @@ Test groups can be enabled or disabled (true/false). Default value provided below in [brackets]. ------------------------------------------------------------------ -./gradlew test -Dtests.nightly=[false] - nightly test group (@Nightly) ./gradlew test -Dtests.weekly=[false] - weekly tests (@Weekly) ./gradlew test -Dtests.awaitsfix=[false] - known issue (@AwaitsFix) ------------------------------------------------------------------ From edb40c0a17bc7d144d8a99eb164f7aec9b264202 Mon Sep 17 00:00:00 2001 From: lipsill Date: Thu, 18 Oct 2018 01:12:12 +0200 Subject: [PATCH 2/2] remove references to unused annotations --- TESTING.asciidoc | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/TESTING.asciidoc b/TESTING.asciidoc index 2a98d8d2cecab..9c8ab20a3a61c 100644 --- a/TESTING.asciidoc +++ b/TESTING.asciidoc @@ -77,38 +77,24 @@ Run a single test case (variants) ./gradlew test "-Dtests.class=*.ClassName" ---------------------------------------------------------- -Run all tests in a package and sub-packages +Run all tests in a package and its sub-packages ---------------------------------------------------- ./gradlew test "-Dtests.class=org.elasticsearch.package.*" ---------------------------------------------------- -Run any test methods that contain 'esi' (like: ...r*esi*ze...). +Run any test methods that contain 'esi' (like: ...r*esi*ze...) ------------------------------- ./gradlew test "-Dtests.method=*esi*" ------------------------------- -You can also filter tests by certain annotations ie: - - * `@Backwards` - backwards compatibility tests (disabled by default) - * `@AwaitsFix` - tests that are waiting for a bugfix (disabled by default) - * `@BadApple` - tests that are known to fail randomly (disabled by default) - -Those annotation names can be combined into a filter expression like: +Run all tests that are waiting for a bugfix (disabled by default) ------------------------------------------------ -./gradlew test -Dtests.filter="@awaitsfix and not @backwards" +./gradlew test -Dtests.filter=@awaitsfix ------------------------------------------------ -to run all tests waiting for a bug fix but not the ones that are backwards tests. -`tests.filter` supports the boolean operators `and, or, not` and grouping ie: - - ---------------------------------------------------------------- -./gradlew test -Dtests.filter="@awaitsfix and not(@badapple or @backwards)" ---------------------------------------------------------------- - === Seed and repetitions. Run with a given seed (seed is a hex-encoded long). @@ -159,7 +145,6 @@ Test groups can be enabled or disabled (true/false). Default value provided below in [brackets]. ------------------------------------------------------------------ -./gradlew test -Dtests.weekly=[false] - weekly tests (@Weekly) ./gradlew test -Dtests.awaitsfix=[false] - known issue (@AwaitsFix) ------------------------------------------------------------------