mirror of
https://github.com/elastic/kibana.git
synced 2025-04-24 09:48:58 -04:00
* [ML] Fix flaky Trained Models tests (#125484)
* add extra assertion
* prevent extra call on init
* fix stats call
(cherry picked from commit b51c87f24c
)
# Conflicts:
# x-pack/test/functional/services/ml/common_ui.ts
# x-pack/test/functional/services/ml/index.ts
* update refresh button check
This commit is contained in:
parent
ef3c39efbf
commit
bd277583e7
6 changed files with 16 additions and 9 deletions
|
@ -81,10 +81,7 @@ export function trainedModelsApiProvider(httpService: HttpService) {
|
|||
* @param params - Optional query params
|
||||
*/
|
||||
getTrainedModelStats(modelId?: string | string[], params?: InferenceStatsQueryParams) {
|
||||
let model = modelId ?? '_all';
|
||||
if (Array.isArray(modelId)) {
|
||||
model = modelId.join(',');
|
||||
}
|
||||
const model = (Array.isArray(modelId) ? modelId.join(',') : modelId) || '_all';
|
||||
|
||||
return httpService.http<InferenceStatsResponse>({
|
||||
path: `${apiBasePath}/trained_models/${model}/_stats`,
|
||||
|
|
|
@ -190,6 +190,7 @@ export const ModelsList: FC = () => {
|
|||
|
||||
useEffect(
|
||||
function updateOnTimerRefresh() {
|
||||
if (!refresh) return;
|
||||
fetchModelsData();
|
||||
},
|
||||
[refresh]
|
||||
|
|
|
@ -14,8 +14,6 @@ export default function ({ getService }: FtrProviderContext) {
|
|||
before(async () => {
|
||||
await ml.trainedModels.createTestTrainedModels('classification', 15, true);
|
||||
await ml.trainedModels.createTestTrainedModels('regression', 15);
|
||||
await ml.securityUI.loginAsMlPowerUser();
|
||||
await ml.navigation.navigateToTrainedModels();
|
||||
});
|
||||
|
||||
after(async () => {
|
||||
|
@ -46,6 +44,7 @@ export default function ({ getService }: FtrProviderContext) {
|
|||
before(async () => {
|
||||
await ml.securityUI.loginAsMlPowerUser();
|
||||
await ml.navigation.navigateToTrainedModels();
|
||||
await ml.trainedModelsTable.waitForRefreshButtonLoaded();
|
||||
});
|
||||
|
||||
after(async () => {
|
||||
|
@ -173,6 +172,7 @@ export default function ({ getService }: FtrProviderContext) {
|
|||
before(async () => {
|
||||
await ml.securityUI.loginAsMlViewer();
|
||||
await ml.navigation.navigateToTrainedModels();
|
||||
await ml.trainedModelsTable.waitForRefreshButtonLoaded();
|
||||
});
|
||||
|
||||
after(async () => {
|
||||
|
|
|
@ -309,5 +309,9 @@ export function MachineLearningCommonUIProvider({
|
|||
await PageObjects.spaceSelector.goToSpecificSpace(spaceId);
|
||||
await PageObjects.spaceSelector.expectHomePage(spaceId);
|
||||
},
|
||||
|
||||
async waitForDatePickerIndicatorLoaded() {
|
||||
await testSubjects.waitForEnabled('superDatePickerApplyTimeButton');
|
||||
},
|
||||
};
|
||||
}
|
||||
|
|
|
@ -123,7 +123,7 @@ export function MachineLearningProvider(context: FtrProviderContext) {
|
|||
const alerting = MachineLearningAlertingProvider(context, commonUI);
|
||||
const swimLane = SwimLaneProvider(context);
|
||||
const trainedModels = TrainedModelsProvider(context, api, commonUI);
|
||||
const trainedModelsTable = TrainedModelsTableProvider(context);
|
||||
const trainedModelsTable = TrainedModelsTableProvider(context, commonUI);
|
||||
|
||||
return {
|
||||
anomaliesTable,
|
||||
|
|
|
@ -10,7 +10,8 @@ import { ProvidedType } from '@kbn/test';
|
|||
import { upperFirst } from 'lodash';
|
||||
|
||||
import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
|
||||
import { FtrProviderContext } from '../../ftr_provider_context';
|
||||
import type { FtrProviderContext } from '../../ftr_provider_context';
|
||||
import type { MlCommonUI } from './common_ui';
|
||||
|
||||
export interface TrainedModelRowData {
|
||||
id: string;
|
||||
|
@ -20,7 +21,10 @@ export interface TrainedModelRowData {
|
|||
|
||||
export type MlTrainedModelsTable = ProvidedType<typeof TrainedModelsTableProvider>;
|
||||
|
||||
export function TrainedModelsTableProvider({ getService }: FtrProviderContext) {
|
||||
export function TrainedModelsTableProvider(
|
||||
{ getService }: FtrProviderContext,
|
||||
mlCommonUI: MlCommonUI
|
||||
) {
|
||||
const testSubjects = getService('testSubjects');
|
||||
const retry = getService('retry');
|
||||
|
||||
|
@ -218,6 +222,7 @@ export function TrainedModelsTableProvider({ getService }: FtrProviderContext) {
|
|||
await testSubjects.existOrFail('mlTrainedModelRowDetails', { timeout: 1000 });
|
||||
}
|
||||
});
|
||||
await this.waitForRefreshButtonLoaded();
|
||||
}
|
||||
|
||||
public async assertTabContent(
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue