Skip to content

Commit 526f88c

Browse files
committed
[ML] fix tests arrangement
1 parent 24d4b57 commit 526f88c

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

x-pack/test/functional/apps/machine_learning/data_frame_analytics/cloning.ts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
1212
export default function({ getService }: FtrProviderContext) {
1313
const esArchiver = getService('esArchiver');
1414
const ml = getService('ml');
15-
describe('data frame analytics jobs cloning supported by UI form', function() {
15+
describe('jobs cloning supported by UI form', function() {
1616
this.tags(['smoke']);
1717

1818
const testDataList: Array<{
@@ -119,21 +119,11 @@ export default function({ getService }: FtrProviderContext) {
119119
})();
120120

121121
before(async () => {
122-
// Create jobs for cloning
123-
for (const testData of testDataList) {
124-
await esArchiver.load(testData.archive);
125-
await ml.api.createDataFrameAnalyticsJob(testData.job as DataFrameAnalyticsConfig);
126-
}
127122
await ml.securityUI.loginAsMlPowerUser();
128123
});
129124

130125
after(async () => {
131126
await ml.api.cleanMlIndices();
132-
// Clean destination indices of the original jobs
133-
for (const testData of testDataList) {
134-
await ml.api.deleteIndices(testData.job.dest!.index as string);
135-
await esArchiver.unload(testData.archive);
136-
}
137127
});
138128

139129
for (const testData of testDataList) {
@@ -142,6 +132,9 @@ export default function({ getService }: FtrProviderContext) {
142132
const cloneDestIndex = `${testData.job!.dest!.index}_clone`;
143133

144134
before(async () => {
135+
await esArchiver.load(testData.archive);
136+
await ml.api.createDataFrameAnalyticsJob(testData.job as DataFrameAnalyticsConfig);
137+
145138
await ml.navigation.navigateToMl();
146139
await ml.navigation.navigateToDataFrameAnalytics();
147140
await ml.dataFrameAnalyticsTable.waitForAnalyticsToLoad();
@@ -151,6 +144,8 @@ export default function({ getService }: FtrProviderContext) {
151144

152145
after(async () => {
153146
await ml.api.deleteIndices(cloneDestIndex);
147+
await ml.api.deleteIndices(testData.job.dest!.index as string);
148+
await esArchiver.unload(testData.archive);
154149
});
155150

156151
it('should open the flyout with a proper header', async () => {

x-pack/test/functional/services/machine_learning/data_frame_analytics_creation.ts

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -329,11 +329,8 @@ export function MachineLearningDataFrameAnalyticsCreationProvider(
329329
},
330330

331331
async isCreateButtonDisabled() {
332-
const attrValue = await testSubjects.getAttribute(
333-
'mlAnalyticsCreateJobFlyoutCreateButton',
334-
'disabled'
335-
);
336-
return attrValue === '';
332+
const isEnabled = await testSubjects.isEnabled('mlAnalyticsCreateJobFlyoutCreateButton');
333+
return !isEnabled;
337334
},
338335

339336
async createAnalyticsJob() {

0 commit comments

Comments
 (0)