From 9e3b6a090baf7646a10b2208ab53c431eae2b54d Mon Sep 17 00:00:00 2001 From: Molly Struve Date: Tue, 9 Jun 2020 07:55:28 -0500 Subject: [PATCH] Flaky Spec Fixes: Dont Assume No Elasticsearch Data, Refresh before delete_by_query (#8354) --- spec/support/elasticsearch_helpers.rb | 1 + spec/workers/metrics/record_data_counts_worker_spec.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/spec/support/elasticsearch_helpers.rb b/spec/support/elasticsearch_helpers.rb index 9c63c1d8c..128eb05b2 100644 --- a/spec/support/elasticsearch_helpers.rb +++ b/spec/support/elasticsearch_helpers.rb @@ -10,6 +10,7 @@ module ElasticsearchHelpers end def clear_elasticsearch_data(search_class) + search_class.refresh_index Search::Client.delete_by_query( index: search_class::INDEX_ALIAS, body: { query: { match_all: {} } }, ) diff --git a/spec/workers/metrics/record_data_counts_worker_spec.rb b/spec/workers/metrics/record_data_counts_worker_spec.rb index a5c25fcb7..c124dffb1 100644 --- a/spec/workers/metrics/record_data_counts_worker_spec.rb +++ b/spec/workers/metrics/record_data_counts_worker_spec.rb @@ -45,7 +45,7 @@ RSpec.describe Metrics::RecordDataCountsWorker, type: :worker do expect( DatadogStatsClient, - ).to have_received(:gauge).with("elasticsearch.document_count", 0, tags: Array).at_least(1) + ).to have_received(:gauge).with("elasticsearch.document_count", Integer, tags: Array).at_least(1) end end end