diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2019-03-12 23:16:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-03-12 23:16:41 +0000 |
| commit | 164d7feeec15205da4b57d84bacb7e33e1072a2a (patch) | |
| tree | a41c43cce7638238d4796bd1a6fcab59d0382855 | |
| parent | 548745b2e4d74494da9d6429bd25626b5369fb1d (diff) | |
| parent | 4729d7de860eb139b3431ad95ad4a0fa8b0d66bf (diff) | |
Merge "Elasticsearch tests: Remove the flaky tag from BUILD files" into stable-2.16
| -rw-r--r-- | javatests/com/google/gerrit/acceptance/pgm/BUILD | 1 | ||||
| -rw-r--r-- | javatests/com/google/gerrit/elasticsearch/BUILD | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/javatests/com/google/gerrit/acceptance/pgm/BUILD b/javatests/com/google/gerrit/acceptance/pgm/BUILD index e8cf516907..e0ed78a539 100644 --- a/javatests/com/google/gerrit/acceptance/pgm/BUILD +++ b/javatests/com/google/gerrit/acceptance/pgm/BUILD @@ -26,7 +26,6 @@ acceptance_tests( "docker", "elastic", "exclusive", - "flaky", "pgm", "no_windows", ], diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD index 4806accd6e..c58608043f 100644 --- a/javatests/com/google/gerrit/elasticsearch/BUILD +++ b/javatests/com/google/gerrit/elasticsearch/BUILD @@ -65,7 +65,7 @@ ELASTICSEARCH_TAGS = [ name = "elasticsearch_query_%ss_test_V6" % name, size = "large", srcs = [src], - tags = ELASTICSEARCH_TAGS + ["flaky"], + tags = ELASTICSEARCH_TAGS, deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name], ) for name, src in ELASTICSEARCH_TESTS_V6.items()] @@ -73,7 +73,7 @@ ELASTICSEARCH_TAGS = [ name = "elasticsearch_query_%ss_test_V7" % name, size = "large", srcs = [src], - tags = ELASTICSEARCH_TAGS + ["flaky"], + tags = ELASTICSEARCH_TAGS, deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + [ "//lib/httpcomponents:httpasyncclient", "//lib/httpcomponents:httpclient", |