habsi/elasticsearch-js
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved integration test runner

Browse Source
This commit is contained in:
delvedor
2019-03-27 14:59:55 +01:00
parent ad6f56c3f1
commit 5bc57b03bf
1 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
test/integration/index.js
View File

@ -43,28 +43,28 @@ const customSkips = [
] ]
const platinumBlackList = { const platinumBlackList = {
// file path: test name // file path: test name
'cat.aliases/10_basic.yml': 'Empty cluster', 'cat.aliases/10_basic.yml': ['Empty cluster'],
'index/10_with_id.yml': 'Index with ID', 'index/10_with_id.yml': ['Index with ID'],
'indices.get_alias/10_basic.yml': 'Get alias against closed indices', 'indices.get_alias/10_basic.yml': ['Get alias against closed indices'],
'indices.get_alias/20_empty.yml': 'Check empty aliases when getting all aliases via /_alias', 'indices.get_alias/20_empty.yml': ['Check empty aliases when getting all aliases via /_alias'],
// https://github.com/elastic/elasticsearch/pull/39400 // https://github.com/elastic/elasticsearch/pull/39400
'ml/jobs_crud.yml': 'Test put job with id that is already taken', 'ml/jobs_crud.yml': ['Test put job with id that is already taken'],
// TODO: investigate why this is failing // TODO: investigate why this is failing
'monitoring/bulk/10_basic.yml': '*', 'monitoring/bulk/10_basic.yml': ['*'],
'monitoring/bulk/20_privileges.yml': '*', 'monitoring/bulk/20_privileges.yml': ['*'],
'license/20_put_license.yml': '*', 'license/20_put_license.yml': ['*'],
'snapshot/10_basic.yml': '*', 'snapshot/10_basic.yml': ['*'],
// the body is correct, but the regex is failing // the body is correct, but the regex is failing
'sql/sql.yml': 'Getting textual representation', 'sql/sql.yml': ['Getting textual representation'],
// we are setting two certificates in the docker config // we are setting two certificates in the docker config
'ssl/10_basic.yml': '*', 'ssl/10_basic.yml': ['*'],
// docker issue? // docker issue?
'watcher/execute_watch/60_http_input.yml': '*', 'watcher/execute_watch/60_http_input.yml': ['*'],
// the checks are correct, but for some reason the test is failing on js side // the checks are correct, but for some reason the test is failing on js side
// I bet is because the backslashes in the rg // I bet is because the backslashes in the rg
'watcher/execute_watch/70_invalid.yml': '*', 'watcher/execute_watch/70_invalid.yml': ['*'],
'watcher/put_watch/10_basic.yml': '*', 'watcher/put_watch/10_basic.yml': ['*'],
'xpack/15_basic.yml': '*' 'xpack/15_basic.yml': ['*']
} }
function Runner (opts) { function Runner (opts) {
@ -93,7 +93,7 @@ Runner.prototype.waitCluster = function (callback, times = 0) {
this.client.cluster.health( this.client.cluster.health(
{ waitForStatus: 'green', timeout: '50s' }, { waitForStatus: 'green', timeout: '50s' },
(err, res) => { (err, res) => {
if (++times < 10) { if (err && ++times < 10) {
setTimeout(() => { setTimeout(() => {
this.waitCluster(callback, times) this.waitCluster(callback, times)
}, 5000) }, 5000)
@ -184,10 +184,13 @@ Runner.prototype.start = function (opts) {
if (opts.isPlatinum) { if (opts.isPlatinum) {
const list = Object.keys(platinumBlackList) const list = Object.keys(platinumBlackList)
for (i = 0; i < list.length; i++) { for (i = 0; i < list.length; i++) {
if (file.endsWith(list[i]) && (name === platinumBlackList[list[i]] || platinumBlackList[list[i]] === '*')) { const platTest = platinumBlackList[list[i]]
const testName = file.slice(file.indexOf(`${sep}elasticsearch${sep}`)) + ' / ' + name for (var j = 0; j < platTest.length; j++) {
tap.skip(`Skipping test ${testName} because is blacklisted in the platinum test`) if (file.endsWith(list[i]) && (name === platTest[j] || platTest[j] === '*')) {
return const testName = file.slice(file.indexOf(`${sep}elasticsearch${sep}`)) + ' / ' + name
tap.skip(`Skipping test ${testName} because is blacklisted in the platinum test`)
return
}
} }
} }
} }