Small fix in ES tests

This commit is contained in:
Nikolay Martynov 2018-11-26 13:07:42 -08:00
parent 23203fb659
commit 467f14c359
1 changed files with 2 additions and 2 deletions

View File

@ -153,7 +153,7 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
and: and:
// FIXME: it looks like proper approach is to provide TEST_WRITER with an API to filter traces as they are written // FIXME: it looks like proper approach is to provide TEST_WRITER with an API to filter traces as they are written
TEST_WRITER.waitForTraces(7) TEST_WRITER.waitForTraces(7)
filterIgnoredActions() == null filterIgnoredActions()
// IndexAction and PutMappingAction run in separate threads and order in which // IndexAction and PutMappingAction run in separate threads and order in which
// these spans are closed is not defined. So we force the order if it is wrong. // these spans are closed is not defined. So we force the order if it is wrong.
if (TEST_WRITER[3][0].resourceName == "IndexAction") { if (TEST_WRITER[3][0].resourceName == "IndexAction") {
@ -379,7 +379,7 @@ class Elasticsearch53SpringTemplateTest extends AgentTestRunner {
indexName = "test-index-extract" indexName = "test-index-extract"
} }
def filterIgnoredActions() { void filterIgnoredActions() {
for (int i = 0; i < TEST_WRITER.size(); i++) { for (int i = 0; i < TEST_WRITER.size(); i++) {
if (IGNORED_ACTIONS.contains(TEST_WRITER[i][0].getResourceName())) { if (IGNORED_ACTIONS.contains(TEST_WRITER[i][0].getResourceName())) {
TEST_WRITER.remove(i) TEST_WRITER.remove(i)