Skip to content

Commit

Permalink
[Archive Migration] batch 3 of removing es_archives/empty_kibana (ela…
Browse files Browse the repository at this point in the history 
…stic#139319)

* replace es_archiver/empty_kibana with cleanStandardList

* [CI] Auto-commit changed files from 'node scripts/precommit_hook.js --ref HEAD~1..HEAD --fix'

Co-authored-by: kibanamachine <[email protected]>
  • Loading branch information
@kibanamachine @Mpdreamz
2 people authored and Mpdreamz committed Sep 6, 2022
1 parent 5a453db commit 71b1bc9
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 9 deletions.
3 changes: 2 additions & 1 deletion test/functional/apps/visualize/group1/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
const browser = getService('browser');
const log = getService('log');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

describe('visualize app - group1', () => {
before(async () => {
log.debug('Starting visualize before method');
await browser.setWindowSize(1280, 800);
await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
await kibanaServer.savedObjects.cleanStandardList();

await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
Expand Down
4 changes: 2 additions & 2 deletions test/functional/apps/visualize/group2/_histogram_request_start.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
const log = getService('log');
const retry = getService('retry');
const esArchiver = getService('esArchiver');

const kibanaServer = getService('kibanaServer');
const PageObjects = getPageObjects([
'common',
'visualize',
Expand All @@ -26,7 +26,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
describe('histogram agg onSearchRequestStart', function () {
before(async function () {
// loading back default data
await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
await kibanaServer.savedObjects.cleanStandardList();

await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
Expand Down
3 changes: 2 additions & 1 deletion test/functional/apps/visualize/group2/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
const browser = getService('browser');
const log = getService('log');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

describe('visualize app', () => {
before(async () => {
log.debug('Starting visualize before method');
await browser.setWindowSize(1280, 800);
await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
await kibanaServer.savedObjects.cleanStandardList();

await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/visualize/group3/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
before(async () => {
log.debug('Starting visualize before method');
await browser.setWindowSize(1280, 800);
await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
await kibanaServer.savedObjects.cleanStandardList();

await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
Expand Down
3 changes: 2 additions & 1 deletion test/functional/apps/visualize/group4/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
const browser = getService('browser');
const log = getService('log');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

describe('visualize app', () => {
before(async () => {
log.debug('Starting visualize before method');
await browser.setWindowSize(1280, 800);
await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
await kibanaServer.savedObjects.cleanStandardList();

await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
Expand Down
3 changes: 2 additions & 1 deletion test/functional/apps/visualize/group5/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
const browser = getService('browser');
const log = getService('log');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

describe('visualize app', () => {
before(async () => {
log.debug('Starting visualize before method');
await browser.setWindowSize(1280, 800);
await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
await kibanaServer.savedObjects.cleanStandardList();

await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
Expand Down
3 changes: 2 additions & 1 deletion test/functional/apps/visualize/group6/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
const browser = getService('browser');
const log = getService('log');
const esArchiver = getService('esArchiver');
const kibanaServer = getService('kibanaServer');

describe('visualize app', () => {
before(async () => {
log.debug('Starting visualize before method');
await browser.setWindowSize(1280, 800);
await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
await kibanaServer.savedObjects.cleanStandardList();

await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
Expand Down
2 changes: 1 addition & 1 deletion test/functional/apps/visualize/replaced_vislib_chart_types/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
before(async () => {
log.debug('Starting visualize before method');
await browser.setWindowSize(1280, 800);
await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
await kibanaServer.savedObjects.cleanStandardList();

await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
Expand Down

0 comments on commit 71b1bc9

Please sign in to comment.