From 18a87fca827b428cf4fc3a62b991e1bf0ce3ee16 Mon Sep 17 00:00:00 2001
From: delvedor <tommydelved@gmail.com>
Date: Tue, 25 Feb 2020 14:31:54 +0100
Subject: [PATCH] Fixed integration test

---
 test/integration/index.js       |  5 ++++-
 test/integration/test-runner.js | 10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/integration/index.js b/test/integration/index.js
index e44638b20..3b6af6217 100644
--- a/test/integration/index.js
+++ b/test/integration/index.js
@@ -31,7 +31,10 @@ const ossSkips = {
   'nodes.stats/30_discovery.yml': ['*'],
   // the expected error is returning a 503,
   // which triggers a retry and the node to be marked as dead
-  'search.aggregation/240_max_buckets.yml': ['*']
+  'search.aggregation/240_max_buckets.yml': ['*'],
+  // the yaml runner assumes that null means "does not exists",
+  // while null is a valid json value, so the check will fail
+  'search/320_disallow_queries.yml': ['Test disallow expensive queries']
 }
 const xPackBlackList = {
   // file path: test name
diff --git a/test/integration/test-runner.js b/test/integration/test-runner.js
index 1bac11077..96443f9b2 100644
--- a/test/integration/test-runner.js
+++ b/test/integration/test-runner.js
@@ -42,13 +42,19 @@ function build (opts = {}) {
     stash.clear()
 
     try {
-      await client.indices.deleteAlias({ index: '_all', name: '_all' }, { ignore: 404 })
+      await client.indices.deleteAlias({
+        index: '_all',
+        name: '_all'
+      }, { ignore: 404 })
     } catch (err) {
       assert.ifError(err, 'should not error: indices.deleteAlias')
     }
 
     try {
-      await client.indices.delete({ index: '_all' }, { ignore: 404 })
+      await client.indices.delete({
+        index: '_all',
+        expand_wildcards: 'open,closed,hidden'
+      }, { ignore: 404 })
     } catch (err) {
       assert.ifError(err, 'should not error: indices.delete')
     }