Skip to content

Commit 4a6b4a4

Browse files
committed
MC-34482: MFTF tests causing high load on Jenkins agents in MTSv1 platform
1 parent 3ba7d03 commit 4a6b4a4

6 files changed

+14
-6
lines changed

app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportGroupedProductWithSpecialPriceTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969

7070
<!-- Start message queue for export consumer -->
7171
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
72+
<reloadPage stepKey="refreshPage"/>
73+
<waitForPageLoad stepKey="waitForPageLoaded"/>
7274

7375
<grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
7476

app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportImportConfigurableProductWithImagesTest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,10 @@
164164
<argument name="attributeData" value="$$createExportImportConfigurableProduct.sku$$"/>
165165
</actionGroup>
166166

167-
<!-- Run cron twice -->
168-
<magentoCLI command="cron:run" stepKey="runCronFirstTime"/>
169-
<magentoCLI command="cron:run" stepKey="runCronSecondTime"/>
167+
<!-- Start message queue for export consumer -->
168+
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
169+
<reloadPage stepKey="refreshPage"/>
170+
<waitForPageLoad stepKey="waitForPageLoaded"/>
170171

171172
<grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
172173

app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleAndConfigurableProductsWithCustomOptionsTest.xml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,10 @@
9898
<argument name="attributeData" value="$$createConfigProduct.sku$$"/>
9999
</actionGroup>
100100

101-
<magentoCron stepKey="runCron"/>
101+
<!-- Start message queue for export consumer -->
102+
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
103+
<reloadPage stepKey="refreshPage"/>
104+
<waitForPageLoad stepKey="waitForPageLoaded"/>
102105

103106
<grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
104107

app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAndConfigurableProductsWithAssignedImagesTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@
115115

116116
<!-- Start message queue for export consumer -->
117117
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
118+
<reloadPage stepKey="refreshPage"/>
119+
<waitForPageLoad stepKey="waitForPageLoaded"/>
118120

119121
<grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
120122

app/code/Magento/CatalogImportExport/Test/Mftf/Test/AdminExportSimpleProductAssignedToMainWebsiteAndConfigurableProductAssignedToCustomWebsiteTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@
9999

100100
<!-- Start message queue for export consumer -->
101101
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue"/>
102+
<reloadPage stepKey="refreshPage"/>
103+
<waitForPageLoad stepKey="waitForPageLoaded"/>
102104

103105
<grabTextFrom selector="{{AdminExportAttributeSection.exportFileNameByPosition('0')}}" stepKey="grabNameFile"/>
104106

app/code/Magento/MessageQueue/Test/Mftf/ActionGroup/AdminStartMessageQueueConsumerActionGroup.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,5 @@
1818

1919
<magentoCLI command="queue:consumers:start {{consumer.consumer_name}} --max-messages={{consumer.message_limit}}" stepKey="startMessageQueue"/>
2020
<wait time="30" stepKey="waitForQueueStarting"/>
21-
<reloadPage stepKey="refreshPage"/>
22-
<waitForPageLoad stepKey="waitForPageLoaded"/>
2321
</actionGroup>
2422
</actionGroups>

0 commit comments

Comments
 (0)