Merge branch 'ACQE-4287_flaky_test_fix' into functional-testing-automation-version2

Author: Manjusha.S

app/code/Magento/ConfigurableProduct/Test/Mftf/Section/AdminProductFormConfigurationsSection/AdminProductFormConfigurationsSection.xml

@@ -10,7 +10,7 @@
     <section name="AdminProductFormConfigurationsSection">
         <element name="sectionHeader" type="text" selector=".admin__collapsible-block-wrapper[data-index='configurable']"/>
         <element name="createdConfigurationsBlock" type="text" selector="div.admin__field.admin__field-wide"/>
-        <element name="createConfigurations" type="button" selector="button[data-index='create_configurable_products_button']" timeout="30"/>
+        <element name="createConfigurations" type="button" selector="button[data-index='create_configurable_products_button']" timeout="40"/>
         <element name="currentVariationsRows" type="button" selector=".data-row"/>
         <element name="currentVariationsNameCells" type="textarea" selector=".admin__control-fields[data-index='name_container']"/>
         <element name="currentVariationsSkuCells" type="textarea" selector=".admin__control-fields[data-index='sku_container']"/>

app/code/Magento/Persistent/Test/Mftf/Test/StorefrontVerifyShoppingCartPersistenceTest.xml

@@ -85,6 +85,7 @@
 
         <wait time="15" stepKey="waitSometime3" />
         <reloadPage stepKey="refreshSessionCookieByPageRefresh3" />
+        <waitForPageLoad stepKey="waitForPageLoadToSeeSuccessMessage"/>
 
         <actionGroup ref="StorefrontAssertPersistentCustomerWelcomeMessageActionGroup" stepKey="seeWelcomeForJohnDoeCustomer">
             <argument name="customerFullName" value="{{John_Smith_Customer.fullname}}"/>

app/code/Magento/Sales/Test/Mftf/Test/StorefrontOrderPagerDisplayedTest.xml

@@ -19,6 +19,7 @@
             <group value="mtf_migrated"/>
         </annotations>
         <before>
+            <magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
             <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="LoginAsAdmin"/>
 
             <createData entity="_defaultCategory" stepKey="createCategory"/>
@@ -117,6 +118,7 @@
             <deleteData createDataKey="createProduct21" stepKey="deleteProduct21"/>
 
             <deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
+            <magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
             <comment userInput="Comment is added to preserve the step key for backward compatibility" stepKey="logout"/>
         </after>