Merge branch 'ACQE-7056' into ACQE-Version-7-functional-mainline-deployment

Author: chandrakalahanchinal

app/code/Magento/AsyncConfig/Test/Mftf/Test/AsyncConfigurationTest.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
 -->
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -59,8 +59,10 @@
         <see selector="{{CatalogSection.successMessage}}" userInput="Configuration changes will be applied by consumer soon." stepKey="seeCustomSuccessMessage"/>
 
         <!--Trigger the Consumer-->
-        <magentoCLI stepKey="EnableAsyncConfig" command="queue:consumers:start saveConfigProcessor --max-messages=1"/>
-
+        <actionGroup ref="CliConsumerStartActionGroup" stepKey="EnableAsyncConfig">
+            <argument name="consumerName" value="saveConfigProcessor"/>
+            <argument name="maxMessages" value="1"/>
+        </actionGroup>
         <!--Open Configuration Page Again-->
         <amOnPage url="{{CatalogConfigPage.url}}" stepKey="navigateToConfigurationPageAgain" />
         <waitForPageLoad stepKey="waitForPageLoadAgain"/>

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

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
- /**
-  * Copyright © Magento, Inc. All rights reserved.
-  * See COPYING.txt for license details.
-  */
+/**
+ * Copyright 2025 Adobe
+ * All Rights Reserved.
+ */
 -->
-
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="CliConsumerStartActionGroup">
@@ -15,8 +14,9 @@
         <arguments>
             <argument name="consumerName" type="string"/>
             <argument name="maxMessages" type="string"/>
+            <argument name="timeout" type="string" defaultValue="10"/>
         </arguments>
 
-        <magentoCLI command="queue:consumers:start {{consumerName}} --max-messages={{maxMessages}}" stepKey="startMessageQueue"/>
+        <magentoCLI timeout="{{timeout}}" command="queue:consumers:start {{consumerName}} --max-messages={{maxMessages}}" stepKey="startMessageQueue"/>
     </actionGroup>
 </actionGroups>