Skip to content

[Monitoring] Fix 7.5 cloud test issues #51781

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
merged 3 commits into from
Dec 11, 2019
Merged

[Monitoring] Fix 7.5 cloud test issues #51781

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9657894
Fix cloud test issues
chrisronline Nov 26, 2019
65d5db2
Merge remote-tracking branch 'elastic/master' into monitoring/cloud_7…
chrisronline Dec 11, 2019
a222655
We don't have to skip for cloud
chrisronline Dec 11, 2019
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
5 changes: 4 additions & 1 deletion x-pack/test/api_integration/apis/monitoring/setup/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
*/

export default function ({ loadTestFile }) {
describe('Setup', () => {
describe('Setup', function () {
// Setup mode is not supported in cloud
this.tags(['skipCloud']);

loadTestFile(require.resolve('./collection'));
});
}
2 changes: 1 addition & 1 deletion x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export default function ({ getService, getPageObjects }) {
const clusterOverview = getService('monitoringClusterOverview');
const retry = getService('retry');

describe('Monitoring is turned off', () => {
describe('Monitoring is turned off', function () {
before(async () => {
const browser = getService('browser');
await browser.setWindowSize(1600, 1000);
Expand Down
23 changes: 17 additions & 6 deletions x-pack/test/functional/services/monitoring/logstash_pipelines.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export function MonitoringLogstashPipelinesProvider({ getService, getPageObjects
const testSubjects = getService('testSubjects');
const retry = getService('retry');
const PageObjects = getPageObjects(['monitoring']);
const find = getService('find');

const SUBJ_LISTING_PAGE = 'logstashPipelinesListing';

Expand All @@ -34,6 +35,12 @@ export function MonitoringLogstashPipelinesProvider({ getService, getPageObjects
return PageObjects.monitoring.tableGetRowsFromContainer(SUBJ_TABLE_CONTAINER);
}

async waitForTableToFinishLoading() {
await retry.try(async () => {
await find.waitForDeletedByCssSelector('.euiBasicTable-loading', 5000);
});
}

async getPipelinesAll() {
const ids = await testSubjects.getVisibleTextAll(SUBJ_PIPELINES_IDS);
const eventsEmittedRates = await testSubjects.getVisibleTextAll(SUBJ_PIPELINES_EVENTS_EMITTED_RATES);
Expand All @@ -57,21 +64,25 @@ export function MonitoringLogstashPipelinesProvider({ getService, getPageObjects
async clickIdCol() {
const headerCell = await testSubjects.find(SUBJ_TABLE_SORT_ID_COL);
const button = await headerCell.findByTagName('button');
return button.click();
await button.click();
await this.waitForTableToFinishLoading();
}

async clickEventsEmittedRateCol() {
const headerCell = await testSubjects.find(SUBJ_TABLE_SORT_EVENTS_EMITTED_RATE_COL);
const button = await headerCell.findByTagName('button');
return button.click();
await button.click();
await this.waitForTableToFinishLoading();
}

setFilter(text) {
return PageObjects.monitoring.tableSetFilter(SUBJ_SEARCH_BAR, text);
async setFilter(text) {
await PageObjects.monitoring.tableSetFilter(SUBJ_SEARCH_BAR, text);
await this.waitForTableToFinishLoading();
}

clearFilter() {
return PageObjects.monitoring.tableClearFilter(SUBJ_SEARCH_BAR);
async clearFilter() {
await PageObjects.monitoring.tableClearFilter(SUBJ_SEARCH_BAR);
await this.waitForTableToFinishLoading();
}

assertNoData() {
Expand Down