MC-22004: Flaky test MC-6192: Checking results of filters: color and other filters

Author: irenelagno

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml

@@ -186,5 +186,8 @@
         <click selector="{{AdminGridMainControls.save}}" stepKey="clickToSaveProduct"/>
         <waitForPageLoad stepKey="waitForNewSimpleProductPage"/>
         <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessageThird"/>
+         <!--TODO: REMOVE AFTER FIX MC-21717 -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush full_page" stepKey="flushCache"/>
     </test>
 </tests>

app/code/Magento/LayeredNavigation/Test/Mftf/Test/AdminCheckResultsOfColorAndOtherFiltersTest.xml

@@ -8,10 +8,8 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminCheckResultsOfColorAndOtherFiltersTest">
-        <magentoCLI command="cache:flush eav" stepKey="flushCache"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
         <!-- Open a category on storefront -->
-        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" after="seeSaveProductMessageThird" stepKey="goToCategoryPage">
+        <actionGroup ref="StorefrontGoToCategoryPageActionGroup" after="flushCache" stepKey="goToCategoryPage">
             <argument name="categoryName" value="$$createCategory.name$$"/>
         </actionGroup>
         <!-- Choose First attribute filter -->

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php

@@ -2637,7 +2637,6 @@ public function testProductBaseImageAfterImport()
         $this->assertNotEquals('/no/exists/image/magento_image.jpg', $productAfterImport->getData('image'));
     }
 
-
     /**
      * Set the current admin session user based on a username
      *