remove "waitCluster" from test/integration

Signed-off-by: Didar Tursunov <89772209+Wielmany@users.noreply.github.com>
Wielmany · Mar 9, 2023 · 6b59918 · 6b59918
1 parent 3a48446
commit 6b59918
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 23 deletions.
diff --git a/test/integration/helpers-secure/search.test.js b/test/integration/helpers-secure/search.test.js
@@ -14,7 +14,7 @@ const { createReadStream } = require('fs');
 const { join } = require('path');
 const split = require('split2');
 const { test, beforeEach, afterEach } = require('tap');
-const { waitCluster } = require('../../utils');
+
 const { Client } = require('../../..');
 
 const INDEX = `test-helpers-${process.pid}`;
@@ -30,7 +30,7 @@ const client = new Client({
 });
 
 beforeEach(async () => {
-  await waitCluster(client);
+
   await client.indices.create({ index: INDEX });
   const stream = createReadStream(join(__dirname, '..', '..', 'fixtures', 'stackoverflow.ndjson'));
   const result = await client.helpers.bulk({

diff --git a/test/integration/helpers/bulk.test.js b/test/integration/helpers/bulk.test.js
@@ -33,7 +33,6 @@ const { createReadStream } = require('fs');
 const { join } = require('path');
 const split = require('split2');
 const { test, beforeEach, afterEach } = require('tap');
-const { waitCluster } = require('../../utils');
 const { Client } = require('../../../');
 
 const datasetPath = join(__dirname, '..', '..', 'fixtures', 'stackoverflow.ndjson');
@@ -43,7 +42,7 @@ const client = new Client({
 });
 
 beforeEach(async () => {
-  await waitCluster(client);
+
   await client.indices.create({ index: INDEX });
 });
 

diff --git a/test/integration/helpers/msearch.test.js b/test/integration/helpers/msearch.test.js
@@ -33,7 +33,7 @@ const { createReadStream } = require('fs');
 const { join } = require('path');
 const split = require('split2');
 const { test, beforeEach, afterEach } = require('tap');
-const { waitCluster } = require('../../utils');
+
 const { Client, errors } = require('../../../');
 
 const INDEX = `test-helpers-${process.pid}`;
@@ -42,7 +42,7 @@ const client = new Client({
 });
 
 beforeEach(async () => {
-  await waitCluster(client);
+
   await client.indices.create({ index: INDEX });
   const stream = createReadStream(join(__dirname, '..', '..', 'fixtures', 'stackoverflow.ndjson'));
   const result = await client.helpers.bulk({

diff --git a/test/integration/helpers/scroll.test.js b/test/integration/helpers/scroll.test.js
@@ -33,7 +33,7 @@ const { createReadStream } = require('fs');
 const { join } = require('path');
 const split = require('split2');
 const { test, beforeEach, afterEach } = require('tap');
-const { waitCluster } = require('../../utils');
+
 const { Client } = require('../../../');
 
 const INDEX = `test-helpers-${process.pid}`;
@@ -42,7 +42,7 @@ const client = new Client({
 });
 
 beforeEach(async () => {
-  await waitCluster(client);
+
   await client.indices.create({ index: INDEX });
   const stream = createReadStream(join(__dirname, '..', '..', 'fixtures', 'stackoverflow.ndjson'));
   const result = await client.helpers.bulk({

diff --git a/test/integration/helpers/search.test.js b/test/integration/helpers/search.test.js
@@ -33,7 +33,7 @@ const { createReadStream } = require('fs');
 const { join } = require('path');
 const split = require('split2');
 const { test, beforeEach, afterEach } = require('tap');
-const { waitCluster } = require('../../utils');
+
 const { Client } = require('../../../');
 
 const INDEX = `test-helpers-${process.pid}`;
@@ -42,7 +42,7 @@ const client = new Client({
 });
 
 beforeEach(async () => {
-  await waitCluster(client);
+
   await client.indices.create({ index: INDEX });
   const stream = createReadStream(join(__dirname, '..', '..', 'fixtures', 'stackoverflow.ndjson'));
   const result = await client.helpers.bulk({

diff --git a/test/integration/index.js b/test/integration/index.js
@@ -81,22 +81,9 @@ function runner(opts = {}) {
   });
 }
 
-async function waitCluster(client, times = 0) {
-  try {
-    await client.cluster.health({ waitForStatus: 'green', timeout: '50s' });
-  } catch (err) {
-    if (++times < 10) {
-      await sleep(5000);
-      return waitCluster(client, times);
-    }
-    console.error(err);
-    process.exit(1);
-  }
-}
 
 async function start({ client }) {
   log('Waiting for OpenSearch');
-  await waitCluster(client);
 
   const { body } = await client.info();
   const { number: version, build_hash: hash } = body.version;