Skip to content

Commit 3ba7d03

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

File tree

2 files changed

+18
-12
lines changed

2 files changed

+18
-12
lines changed

app/code/Magento/Catalog/Test/Mftf/Test/AdminMassUpdateProductAttributesGlobalScopeTest.xml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<createData entity="ApiSimpleProduct" stepKey="createProductTwo">
3131
<requiredEntity createDataKey="createCategory"/>
3232
</createData>
33+
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
3334
</before>
3435
<after>
3536
<deleteData createDataKey="createProductOne" stepKey="deleteProductOne"/>
@@ -39,6 +40,7 @@
3940
<click selector="{{AdminStoresGridSection.resetButton}}" stepKey="resetSearchFilter"/>
4041
<actionGroup ref="ClearProductsFilterActionGroup" stepKey="clearProductFilter"/>
4142
<actionGroup ref="AdminLogoutActionGroup" stepKey="amOnLogoutPage"/>
43+
<magentoCron groups="index" stepKey="reindexInvalidatedIndicesAfterDelete"/>
4244
</after>
4345

4446
<!-- Search and select products -->
@@ -59,22 +61,22 @@
5961
<actionGroup ref="AdminSwitchStoreViewActionGroup" stepKey="AdminSwitchStoreViewActionGroup"/>
6062
<!-- Update attribute -->
6163
<checkOption selector="{{AdminEditProductAttributesSection.ChangeAttributePriceToggle}}" stepKey="toggleToChangePrice"/>
62-
<fillField selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="$$createProductOne.price$$0" stepKey="fillAttributeNameField"/>
64+
<fillField selector="{{AdminEditProductAttributesSection.AttributePrice}}" userInput="$createProductOne.price$0" stepKey="fillAttributeNameField"/>
6365
<click selector="{{AdminEditProductAttributesSection.Save}}" stepKey="save"/>
6466
<waitForElementVisible selector="{{AdminMessagesSection.success}}" time="60" stepKey="waitForSuccessMessage"/>
6567
<see selector="{{AdminMessagesSection.success}}" userInput="Message is added to queue" stepKey="seeAttributeUpdateSuccessMsg"/>
6668

67-
<!-- Run cron twice -->
68-
<magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron1"/>
69-
<magentoCLI command="cron:run" arguments="--group=consumers" stepKey="runCron2"/>
70-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
69+
<!-- Start message queue for product attribute consumer -->
70+
<actionGroup ref="AdminStartMessageQueueConsumerActionGroup" stepKey="startMessageQueue">
71+
<argument name="consumer" value="AdminProductAttributeUpdateMessageConsumerData"/>
72+
</actionGroup>
7173

7274
<!-- Assert on storefront default view -->
7375
<actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupDefault"/>
7476
<actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameDefault">
75-
<argument name="name" value="&quot;$$createProductOne.name$$&quot;"/>
76-
<argument name="priceFrom" value="$$createProductOne.price$$0"/>
77-
<argument name="priceTo" value="$$createProductOne.price$$0"/>
77+
<argument name="name" value="&quot;$createProductOne.name$&quot;"/>
78+
<argument name="priceFrom" value="$createProductOne.price$0"/>
79+
<argument name="priceTo" value="$createProductOne.price$0"/>
7880
</actionGroup>
7981
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultDefault"/>
8082
<waitForElementVisible selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="waitForSearchResultInDefaultView"/>
@@ -84,9 +86,9 @@
8486
<actionGroup ref="GoToStoreViewAdvancedCatalogSearchActionGroup" stepKey="GoToStoreViewAdvancedCatalogSearchActionGroupCustom"/>
8587
<actionGroup ref="StorefrontSwitchStoreViewActionGroup" stepKey="StorefrontSwitchStoreViewActionGroup"/>
8688
<actionGroup ref="StorefrontAdvancedCatalogSearchByProductNameAndPriceActionGroup" stepKey="searchByNameCustom">
87-
<argument name="name" value="&quot;$$createProductOne.name$$&quot;"/>
88-
<argument name="priceFrom" value="$$createProductOne.price$$0"/>
89-
<argument name="priceTo" value="$$createProductOne.price$$0"/>
89+
<argument name="name" value="&quot;$createProductOne.name$&quot;"/>
90+
<argument name="priceFrom" value="$createProductOne.price$0"/>
91+
<argument name="priceTo" value="$createProductOne.price$0"/>
9092
</actionGroup>
9193
<actionGroup ref="StorefrontCheckAdvancedSearchResultActionGroup" stepKey="StorefrontCheckAdvancedSearchResultCustom"/>
9294
<waitForElementVisible selector="{{StorefrontCatalogSearchAdvancedResultMainSection.itemFound}}" stepKey="waitForSearchResultInCustomView"/>

app/code/Magento/MessageQueue/Test/Mftf/Data/QueueConsumerData.xml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="AdminExportMessageConsumerData">
1212
<data key="consumer_name">exportProcessor</data>
13-
<data key="message_limit">1</data>
13+
<data key="message_limit">100</data>
14+
</entity>
15+
<entity name="AdminProductAttributeUpdateMessageConsumerData">
16+
<data key="consumer_name">product_action_attribute.update</data>
17+
<data key="message_limit">100</data>
1418
</entity>
1519
</entities>

0 commit comments

Comments
 (0)