Skip to content

Commit 1a81538

Browse files
authored
[Monitoring] Fix 7.5 cloud test issues (#51781) (#52823)
* Fix cloud test issues * We don't have to skip for cloud
1 parent a4fca06 commit 1a81538

File tree

3 files changed

+22
-8
lines changed

3 files changed

+22
-8
lines changed

x-pack/test/api_integration/apis/monitoring/setup/index.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@
55
*/
66

77
export default function ({ loadTestFile }) {
8-
describe('Setup', () => {
8+
describe('Setup', function () {
9+
// Setup mode is not supported in cloud
10+
this.tags(['skipCloud']);
11+
912
loadTestFile(require.resolve('./collection'));
1013
});
1114
}

x-pack/test/functional/apps/monitoring/enable_monitoring/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export default function ({ getService, getPageObjects }) {
1313
const clusterOverview = getService('monitoringClusterOverview');
1414
const retry = getService('retry');
1515

16-
describe('Monitoring is turned off', () => {
16+
describe('Monitoring is turned off', function () {
1717
before(async () => {
1818
const browser = getService('browser');
1919
await browser.setWindowSize(1600, 1000);

x-pack/test/functional/services/monitoring/logstash_pipelines.js

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ export function MonitoringLogstashPipelinesProvider({ getService, getPageObjects
1010
const testSubjects = getService('testSubjects');
1111
const retry = getService('retry');
1212
const PageObjects = getPageObjects(['monitoring']);
13+
const find = getService('find');
1314

1415
const SUBJ_LISTING_PAGE = 'logstashPipelinesListing';
1516

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

38+
async waitForTableToFinishLoading() {
39+
await retry.try(async () => {
40+
await find.waitForDeletedByCssSelector('.euiBasicTable-loading', 5000);
41+
});
42+
}
43+
3744
async getPipelinesAll() {
3845
const ids = await testSubjects.getVisibleTextAll(SUBJ_PIPELINES_IDS);
3946
const eventsEmittedRates = await testSubjects.getVisibleTextAll(SUBJ_PIPELINES_EVENTS_EMITTED_RATES);
@@ -57,21 +64,25 @@ export function MonitoringLogstashPipelinesProvider({ getService, getPageObjects
5764
async clickIdCol() {
5865
const headerCell = await testSubjects.find(SUBJ_TABLE_SORT_ID_COL);
5966
const button = await headerCell.findByTagName('button');
60-
return button.click();
67+
await button.click();
68+
await this.waitForTableToFinishLoading();
6169
}
6270

6371
async clickEventsEmittedRateCol() {
6472
const headerCell = await testSubjects.find(SUBJ_TABLE_SORT_EVENTS_EMITTED_RATE_COL);
6573
const button = await headerCell.findByTagName('button');
66-
return button.click();
74+
await button.click();
75+
await this.waitForTableToFinishLoading();
6776
}
6877

69-
setFilter(text) {
70-
return PageObjects.monitoring.tableSetFilter(SUBJ_SEARCH_BAR, text);
78+
async setFilter(text) {
79+
await PageObjects.monitoring.tableSetFilter(SUBJ_SEARCH_BAR, text);
80+
await this.waitForTableToFinishLoading();
7181
}
7282

73-
clearFilter() {
74-
return PageObjects.monitoring.tableClearFilter(SUBJ_SEARCH_BAR);
83+
async clearFilter() {
84+
await PageObjects.monitoring.tableClearFilter(SUBJ_SEARCH_BAR);
85+
await this.waitForTableToFinishLoading();
7586
}
7687

7788
assertNoData() {

0 commit comments

Comments
 (0)