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

Integration test: Fix yaml parser and crash on failure (#1423)

Browse Source 
* Fix yaml parser and crash on failure

* Log response in case of ResponseError

* Updated cleanup

* Updated skip list

* Updated skip list

* Updated skip list
This commit is contained in:
Tomas Della Vedova
2021-03-24 07:52:54 +01:00
committed by delvedor
parent 886289e3f5
commit c8aae67cd6
3 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/integration/helper.js
View File

@ -85,6 +85,8 @@ function isXPackTemplate (name) {
case 'synthetics-mappings': case 'synthetics-mappings':
case '.snapshot-blob-cache': case '.snapshot-blob-cache':
case '.deprecation-indexing-template': case '.deprecation-indexing-template':
case '.deprecation-indexing-mappings':
case '.deprecation-indexing-settings':
return true return true
} }
return false return false

16
test/integration/index.js
View File

@ -83,6 +83,8 @@ const platinumBlackList = {
], ],
// The cleanup fails with a index not found when retrieving the jobs // The cleanup fails with a index not found when retrieving the jobs
'ml/get_datafeed_stats.yml': ['Test get datafeed stats when total_search_time_ms mapping is missing'], 'ml/get_datafeed_stats.yml': ['Test get datafeed stats when total_search_time_ms mapping is missing'],
// Investigate why is failing
'ml/inference_crud.yml': ['*'],
// investigate why this is failing // 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': ['*'],
@ -91,6 +93,7 @@ const platinumBlackList = {
'snapshot/20_operator_privileges_disabled.yml': ['*'], 'snapshot/20_operator_privileges_disabled.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'],
'searchable_snapshots/10_usage.yml': ['*'],
// 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': ['*'],
// very likely, the index template has not been loaded yet. // very likely, the index template has not been loaded yet.
@ -136,7 +139,15 @@ function runner (opts = {}) {
const client = new Client(options) const client = new Client(options)
log('Loading yaml suite') log('Loading yaml suite')
start({ client, isXPack: opts.isXPack }) start({ client, isXPack: opts.isXPack })
.catch(console.log) .catch(err => {
if (err.name === 'ResponseError') {
console.error(err)
console.log(JSON.stringify(err.meta, null, 2))
} else {
console.error(err)
}
process.exit(1)
})
} }
async function waitCluster (client, times = 0) { async function waitCluster (client, times = 0) {
@ -303,10 +314,9 @@ function now () {
} }
function parse (data) { function parse (data) {
const schema = yaml.Schema.create(yaml.CORE_SCHEMA, [])
let doc let doc
try { try {
doc = yaml.safeLoad(data, { schema }) doc = yaml.load(data, { schema: yaml.CORE_SCHEMA })
} catch (err) { } catch (err) {
console.error(err) console.error(err)
return return

37
test/integration/test-runner.js
View File

@ -95,32 +95,21 @@ function build (opts = {}) {
// clean all indices // clean all indices
await client.indices.delete({ index: '*,-.ds-ilm-history-*', expand_wildcards: 'open,closed,hidden' }, { ignore: [404] }) await client.indices.delete({ index: '*,-.ds-ilm-history-*', expand_wildcards: 'open,closed,hidden' }, { ignore: [404] })
if (isXPack) { // delete templates
// delete templates const { body: templates } = await client.cat.templates({ h: 'name' })
const { body: templates } = await client.cat.templates({ h: 'name' }) for (const template of templates.split('\n').filter(Boolean)) {
for (const template of templates.split('\n').filter(Boolean)) { if (isXPackTemplate(template)) continue
if (isXPackTemplate(template)) continue const { body } = await client.indices.deleteTemplate({ name: template }, { ignore: [404] })
const { body } = await client.indices.deleteTemplate({ name: template }, { ignore: [404] }) if (JSON.stringify(body).includes(`index_template [${template}] missing`)) {
if (JSON.stringify(body).includes(`index_template [${template}] missing`)) { await client.indices.deleteIndexTemplate({ name: template }, { ignore: [404] })
await client.indices.deleteIndexTemplate({ name: template }, { ignore: [404] })
}
} }
}
// delete component template // delete component template
const { body } = await client.cluster.getComponentTemplate() const { body } = await client.cluster.getComponentTemplate()
const components = body.component_templates.filter(c => !isXPackTemplate(c.name)).map(c => c.name) const components = body.component_templates.filter(c => !isXPackTemplate(c.name)).map(c => c.name)
if (components.length > 0) { if (components.length > 0) {
await client.cluster.deleteComponentTemplate({ name: components.join(',') }, { ignore: [404] }) await client.cluster.deleteComponentTemplate({ name: components.join(',') }, { ignore: [404] })
}
} else {
// clean all templates
await client.indices.deleteTemplate({ name: '*' })
// clean all templates
await client.indices.deleteIndexTemplate({ name: '*' })
// clean all templates
await client.cluster.deleteComponentTemplate({ name: '*' })
} }
// Remove any cluster setting // Remove any cluster setting