Skip to content

[QA] Fixup flaky test #156373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wayneseymour merged 2 commits into from
May 8, 2023
Merged

[QA] Fixup flaky test #156373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a322cdc
[QA] Fixup flaky test
wayneseymour May 2, 2023
49ac0d0
Merge branch 'main' into scroll-count-failure
wayneseymour May 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 21 additions & 8 deletions scripts/archive_migration_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,11 @@

standard_list="url,index-pattern,query,graph-workspace,tag,visualization,canvas-element,canvas-workpad,dashboard,search,lens,map,cases,uptime-dynamic-settings,osquery-saved-query,osquery-pack,infrastructure-ui-source,metrics-explorer-view,inventory-view,infrastructure-monitoring-log-view,apm-indices"

orig_archive="x-pack/test/functional/es_archives/security_solution/timelines/7.15.0_space"
new_archive="x-pack/test/functional/fixtures/kbn_archiver/security_solution/timelines/7.15.0_space"
orig_archive="test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects"
new_archive="x-pack/test/functional/fixtures/kbn_archiver/saved_objects_management/hidden_saved_objects"
testFiles=("test/plugin_functional/test_suites/saved_objects_management/scroll_count.ts")

testFiles=("x-pack/test/api_integration/apis/security_solution/timeline_migrations.ts")

test_config="x-pack/test/api_integration/config.ts"
test_config="test/plugin_functional/config.ts"

list_stragglers() {

Expand Down Expand Up @@ -387,13 +386,27 @@ load_kbn() {
local space=${1:-default}
local archive=${2:-${new_archive}}

set -x
node scripts/kbn_archiver.js --config "$test_config" load "$archive" --space "$space"
set +x
}

load_kbn_list() {
local space=${1:-default}
local archive=${2:-${new_archive}}
local newArchives=("${:-${archive}}")

for x in "${newArchives[@]}"; do
set -x
node scripts/kbn_archiver.js --config "$test_config" load "$x" --space "$space"
set +x
load_kbn default "${x}"
done
}

print_so_types() {
set -x
node scripts/saved_objs_info.js --esUrl http://elastic:changeme@localhost:9220
set +x
}

load_created_kbn_archive() {
set -x
node scripts/kbn_archiver.js --config "$test_config" load "$new_archive"
Expand Down
21 changes: 1 addition & 20 deletions test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects/data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,3 @@
{
"type": "doc",
"value": {
"id": "test-hidden-importable-exportable:ff3733a0-9fty-11e7-ahb3-3dcb94193fab",
"index": ".kibana",
"source": {
"coreMigrationVersion": "7.14.0",
"references": [
],
"test-hidden-importable-exportable": {
"title": "Hidden Saved object type that is importable/exportable."
},
"type": "test-hidden-importable-exportable",
"updated_at": "2021-02-11T18:51:23.794Z"
},
"type": "_doc"
}
}

{
"type": "doc",
"value": {
Expand All @@ -34,4 +15,4 @@
},
"type": "_doc"
}
}
}
23 changes: 15 additions & 8 deletions test/plugin_functional/test_suites/saved_objects_hidden_type/delete.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,25 @@ import { PluginFunctionalProviderContext } from '../../services';
export default function ({ getService }: PluginFunctionalProviderContext) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

describe('delete', () => {
before(() =>
esArchiver.load(
before(async () => {
await esArchiver.load(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
after(() =>
esArchiver.unload(
);
await kibanaServer.importExport.load(
'x-pack/test/functional/fixtures/kbn_archiver/saved_objects_management/hidden_saved_objects'
);
});
after(async () => {
await esArchiver.unload(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
);
await kibanaServer.savedObjects.clean({
types: ['test-hidden-importable-exportable'],
});
});

it('should return generic 404 when trying to delete a doc with importableAndExportable types', async () =>
await supertest
Expand Down
24 changes: 15 additions & 9 deletions test/plugin_functional/test_suites/saved_objects_hidden_type/export.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,25 @@ function ndjsonToObject(input: string): string[] {
export default function ({ getService }: PluginFunctionalProviderContext) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

describe('export', () => {
before(() =>
esArchiver.load(
before(async () => {
await esArchiver.load(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
after(() =>
esArchiver.unload(
);
await kibanaServer.importExport.load(
'x-pack/test/functional/fixtures/kbn_archiver/saved_objects_management/hidden_saved_objects'
);
});
after(async () => {
await esArchiver.unload(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);

);
await kibanaServer.savedObjects.clean({
types: ['test-hidden-importable-exportable'],
});
});
it('exports objects with importableAndExportable types', async () =>
await supertest
.post('/api/saved_objects/_export')
Expand Down
23 changes: 15 additions & 8 deletions test/plugin_functional/test_suites/saved_objects_hidden_type/find.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,25 @@ import { PluginFunctionalProviderContext } from '../../services';
export default function ({ getService }: PluginFunctionalProviderContext) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

describe('find', () => {
before(() =>
esArchiver.load(
before(async () => {
await esArchiver.load(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
after(() =>
esArchiver.unload(
);
await kibanaServer.importExport.load(
'x-pack/test/functional/fixtures/kbn_archiver/saved_objects_management/hidden_saved_objects'
);
});
after(async () => {
await esArchiver.unload(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
);
await kibanaServer.savedObjects.clean({
types: ['test-hidden-importable-exportable'],
});
});

it('returns empty response for importableAndExportable types', async () =>
await supertest
Expand Down
23 changes: 15 additions & 8 deletions test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,25 @@ import { PluginFunctionalProviderContext } from '../../services';
export default function ({ getService }: PluginFunctionalProviderContext) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

describe('export', () => {
before(() =>
esArchiver.load(
before(async () => {
await esArchiver.load(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
after(() =>
esArchiver.unload(
);
await kibanaServer.importExport.load(
'x-pack/test/functional/fixtures/kbn_archiver/saved_objects_management/hidden_saved_objects'
);
});
after(async () => {
await esArchiver.unload(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
);
await kibanaServer.savedObjects.clean({
types: ['test-hidden-importable-exportable'],
});
});

it('resolves objects with importableAndExportable types', async () => {
const fileBuffer = Buffer.from(
Expand Down
23 changes: 15 additions & 8 deletions test/plugin_functional/test_suites/saved_objects_management/bulk_get.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,26 @@ import type { PluginFunctionalProviderContext } from '../../services';
export default function ({ getService }: PluginFunctionalProviderContext) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

describe('_bulk_get', () => {
describe('saved objects with hidden type', () => {
before(() =>
esArchiver.load(
before(async () => {
await esArchiver.load(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
after(() =>
esArchiver.unload(
);
await kibanaServer.importExport.load(
'x-pack/test/functional/fixtures/kbn_archiver/saved_objects_management/hidden_saved_objects'
);
});
after(async () => {
await esArchiver.unload(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
);
await kibanaServer.savedObjects.clean({
types: ['test-hidden-importable-exportable'],
});
});
const URL = '/api/kibana/management/saved_objects/_bulk_get';
const hiddenTypeExportableImportable = {
type: 'test-hidden-importable-exportable',
Expand Down
23 changes: 15 additions & 8 deletions test/plugin_functional/test_suites/saved_objects_management/find.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,26 @@ import { PluginFunctionalProviderContext } from '../../services';
export default function ({ getService }: PluginFunctionalProviderContext) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

describe('find', () => {
describe('saved objects with hidden type', () => {
before(() =>
esArchiver.load(
before(async () => {
await esArchiver.load(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
after(() =>
esArchiver.unload(
);
await kibanaServer.importExport.load(
'x-pack/test/functional/fixtures/kbn_archiver/saved_objects_management/hidden_saved_objects'
);
});
after(async () => {
await esArchiver.unload(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
);
await kibanaServer.savedObjects.clean({
types: ['test-hidden-importable-exportable'],
});
});
it('returns saved objects with importableAndExportable types', async () =>
await supertest
.get('/api/kibana/management/saved_objects/_find?type=test-hidden-importable-exportable')
Expand Down
23 changes: 15 additions & 8 deletions test/plugin_functional/test_suites/saved_objects_management/scroll_count.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,27 @@ import { PluginFunctionalProviderContext } from '../../services';
export default function ({ getService }: PluginFunctionalProviderContext) {
const supertest = getService('supertest');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');
const apiUrl = '/api/kibana/management/saved_objects/scroll/counts';

describe('scroll_count', () => {
describe('saved objects with hidden type', () => {
before(() =>
esArchiver.load(
before(async () => {
await esArchiver.load(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
after(() =>
esArchiver.unload(
);
await kibanaServer.importExport.load(
'x-pack/test/functional/fixtures/kbn_archiver/saved_objects_management/hidden_saved_objects'
);
});
after(async () => {
await esArchiver.unload(
'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
)
);
);
await kibanaServer.savedObjects.clean({
types: ['test-hidden-importable-exportable'],
});
});

it('only counts hidden types that are importableAndExportable', async () => {
const res = await supertest
Expand Down
11 changes: 11 additions & 0 deletions .../test/functional/fixtures/kbn_archiver/saved_objects_management/hidden_saved_objects.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"attributes": {
"title": "Hidden Saved object type that is importable/exportable."
},
"coreMigrationVersion": "7.14.0",
"id": "ff3733a0-9fty-11e7-ahb3-3dcb94193fab",
"references": [],
"type": "test-hidden-importable-exportable",
"updated_at": "2021-02-11T18:51:23.794Z",
"version": "WzIsMV0="
}