Skip to content

Commit

Permalink
[8.11] [Data Discovery] Unskip and fix Serverless API integration tes…
Browse files Browse the repository at this point in the history
…ts (#168116) (#168289)

# Backport

This will backport the following commits from `main` to `8.11`:
- [[Data Discovery] Unskip and fix Serverless API integration tests
(#168116)](#168116)

<!--- Backport version: 8.9.7 -->

### Questions ?
Please refer to the [Backport tool
documentation](https://github.com/sqren/backport)

<!--BACKPORT [{"author":{"name":"Davis
McPhee","email":"davis.mcphee@elastic.co"},"sourceCommit":{"committedDate":"2023-10-06T18:32:29Z","message":"[Data
Discovery] Unskip and fix Serverless API integration tests
(#168116)\n\n## Summary\r\n\r\nThis PR unskips and fixes previously
flaky Serverless API integration\r\ntests.\r\n\r\nFlaky test runs:\r\n-
x100:\r\nhttps://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/3364\r\n\r\nResolves
#165868.\r\nResolves #165944.\r\nResolves #165972.\r\nResolves
#165942.\r\nResolves #165476.\r\nResolves #165511.\r\n\r\n###
Checklist\r\n\r\n- [ ] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [x] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios\r\n- [ ] Any UI
touched in this PR is usable by keyboard only (learn more\r\nabout
[keyboard accessibility](https://webaim.org/techniques/keyboard/))\r\n-
[ ] Any UI touched in this PR does not create any new axe
failures\r\n(run axe in
browser:\r\n[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),\r\n[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))\r\n-
[ ] If a plugin configuration key changed, check if it needs to
be\r\nallowlisted in the cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n-
[ ] This renders correctly on smaller devices using a
responsive\r\nlayout. (You can test this [in
your\r\nbrowser](https://www.browserstack.com/guide/responsive-testing-on-local-server))\r\n-
[ ] This was checked for
[cross-browser\r\ncompatibility](https://www.elastic.co/support/matrix#matrix_browsers)\r\n\r\n###
For maintainers\r\n\r\n- [ ] This was checked for breaking API changes
and was
[labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"c95721a40b25ab583e6f180ce5f857a6532e56e6","branchLabelMapping":{"^v8.12.0$":"main","^v(\\d+).(\\d+).\\d+$":"$1.$2"}},"sourcePullRequest":{"labels":["release_note:skip","Team:DataDiscovery","v8.11.0","v8.12.0"],"number":168116,"url":"https://github.com/elastic/kibana/pull/168116","mergeCommit":{"message":"[Data
Discovery] Unskip and fix Serverless API integration tests
(#168116)\n\n## Summary\r\n\r\nThis PR unskips and fixes previously
flaky Serverless API integration\r\ntests.\r\n\r\nFlaky test runs:\r\n-
x100:\r\nhttps://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/3364\r\n\r\nResolves
#165868.\r\nResolves #165944.\r\nResolves #165972.\r\nResolves
#165942.\r\nResolves #165476.\r\nResolves #165511.\r\n\r\n###
Checklist\r\n\r\n- [ ] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [x] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios\r\n- [ ] Any UI
touched in this PR is usable by keyboard only (learn more\r\nabout
[keyboard accessibility](https://webaim.org/techniques/keyboard/))\r\n-
[ ] Any UI touched in this PR does not create any new axe
failures\r\n(run axe in
browser:\r\n[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),\r\n[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))\r\n-
[ ] If a plugin configuration key changed, check if it needs to
be\r\nallowlisted in the cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n-
[ ] This renders correctly on smaller devices using a
responsive\r\nlayout. (You can test this [in
your\r\nbrowser](https://www.browserstack.com/guide/responsive-testing-on-local-server))\r\n-
[ ] This was checked for
[cross-browser\r\ncompatibility](https://www.elastic.co/support/matrix#matrix_browsers)\r\n\r\n###
For maintainers\r\n\r\n- [ ] This was checked for breaking API changes
and was
[labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"c95721a40b25ab583e6f180ce5f857a6532e56e6"}},"sourceBranch":"main","suggestedTargetBranches":["8.11"],"targetPullRequestStates":[{"branch":"8.11","label":"v8.11.0","labelRegex":"^v(\\d+).(\\d+).\\d+$","isSourceBranch":false,"state":"NOT_CREATED"},{"branch":"main","label":"v8.12.0","labelRegex":"^v8.12.0$","isSourceBranch":true,"state":"MERGED","url":"https://github.com/elastic/kibana/pull/168116","number":168116,"mergeCommit":{"message":"[Data
Discovery] Unskip and fix Serverless API integration tests
(#168116)\n\n## Summary\r\n\r\nThis PR unskips and fixes previously
flaky Serverless API integration\r\ntests.\r\n\r\nFlaky test runs:\r\n-
x100:\r\nhttps://buildkite.com/elastic/kibana-flaky-test-suite-runner/builds/3364\r\n\r\nResolves
#165868.\r\nResolves #165944.\r\nResolves #165972.\r\nResolves
#165942.\r\nResolves #165476.\r\nResolves #165511.\r\n\r\n###
Checklist\r\n\r\n- [ ] Any text added follows [EUI's
writing\r\nguidelines](https://elastic.github.io/eui/#/guidelines/writing),
uses\r\nsentence case text and includes
[i18n\r\nsupport](https://github.com/elastic/kibana/blob/main/packages/kbn-i18n/README.md)\r\n-
[
]\r\n[Documentation](https://www.elastic.co/guide/en/kibana/master/development-documentation.html)\r\nwas
added for features that require explanation or tutorials\r\n- [x] [Unit
or
functional\r\ntests](https://www.elastic.co/guide/en/kibana/master/development-tests.html)\r\nwere
updated or added to match the most common scenarios\r\n- [ ] Any UI
touched in this PR is usable by keyboard only (learn more\r\nabout
[keyboard accessibility](https://webaim.org/techniques/keyboard/))\r\n-
[ ] Any UI touched in this PR does not create any new axe
failures\r\n(run axe in
browser:\r\n[FF](https://addons.mozilla.org/en-US/firefox/addon/axe-devtools/),\r\n[Chrome](https://chrome.google.com/webstore/detail/axe-web-accessibility-tes/lhdoppojpmngadmnindnejefpokejbdd?hl=en-US))\r\n-
[ ] If a plugin configuration key changed, check if it needs to
be\r\nallowlisted in the cloud and added to the
[docker\r\nlist](https://github.com/elastic/kibana/blob/main/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker)\r\n-
[ ] This renders correctly on smaller devices using a
responsive\r\nlayout. (You can test this [in
your\r\nbrowser](https://www.browserstack.com/guide/responsive-testing-on-local-server))\r\n-
[ ] This was checked for
[cross-browser\r\ncompatibility](https://www.elastic.co/support/matrix#matrix_browsers)\r\n\r\n###
For maintainers\r\n\r\n- [ ] This was checked for breaking API changes
and was
[labeled\r\nappropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)","sha":"c95721a40b25ab583e6f180ce5f857a6532e56e6"}}]}]
BACKPORT-->

Co-authored-by: Davis McPhee <davis.mcphee@elastic.co>
  • Loading branch information
kibanamachine and davismcphee authored Oct 6, 2023
1 parent ff74ae2 commit 6c1ea44
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,10 @@ export default function ({ getService }: FtrProviderContext) {
.get(defaultPath)
// TODO: API requests in Serverless require internal request headers
.set(svlCommonApi.getInternalRequestHeader());
expect(response6.body[serviceKeyId]).to.be(null);
// TODO: The response comes back undefined in Serverless
const body = response6.body[serviceKeyId];
const expected = body === undefined ? null : body;
expect(expected).to.be(null);
});
});
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ export default function ({ getService }) {
const es = getService('es');
const esArchiver = getService('esArchiver');

// FLAKY: https://github.com/elastic/kibana/issues/165944
describe.skip('index_patterns/* error handler', () => {
describe('index_patterns/* error handler', () => {
let indexNotFoundError;
let docNotFoundError;
before(async () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ export default function ({ getService }: FtrProviderContext) {
const esArchiver = getService('esArchiver');
const svlCommonApi = getService('svlCommonApi');

// FLAKY: https://github.com/elastic/kibana/issues/165972
describe.skip('conflicts', () => {
describe('conflicts', () => {
before(() =>
esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/conflicts')
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ export default function ({ getService }: FtrProviderContext) {
const randomness = getService('randomness');
const svlCommonApi = getService('svlCommonApi');

// FLAKY https://github.com/elastic/kibana/issues/165942
describe.skip('params', () => {
describe('params', () => {
before(() =>
esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index')
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ export default function ({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');

// Failing: See https://github.com/elastic/kibana/issues/165476
describe.skip('rollup data views - fields for wildcard', function () {
describe('rollup data views - fields for wildcard', function () {
before(async () => {
await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,13 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
export default function ({ getService }: FtrProviderContext) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

// FLAKY: https://github.com/elastic/kibana/issues/165511
describe.skip('scripted fields disabled', function () {
describe('scripted fields disabled', function () {
before(async () => {
// TODO: We're running into a 'Duplicate data view: basic_index'
// error in Serverless, so make sure to clean up first
await kibanaServer.savedObjects.cleanStandardList();
await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
});

Expand Down

0 comments on commit 6c1ea44

Please sign in to comment.