Merge remote-tracking branch 'origin/MAGETWO-55416-ft-pagecache' into ft-pr-new

Author: jilu1

dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushAdditionalCachesTest.php

@@ -22,6 +22,7 @@ class FlushAdditionalCachesTest extends Injectable
 {
     /* tags */
     const MVP = 'yes';
+    const SEVERITY = 'S2';
     /* end tags */
 
     /**

dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushAdditionalCachesTest.xml

@@ -8,16 +8,19 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\PageCache\Test\TestCase\FlushAdditionalCachesTest" summary="Flush Additional Caches" ticketId="MAGETWO-34052">
         <variation name="FlushCatalogImagesCacheTest">
+            <data name="tag" xsi:type="string">severity:S2</data>
             <data name="flushButtonName" xsi:type="string">Flush Catalog Images Cache</data>
             <data name="successMessage" xsi:type="string">The image cache was cleaned.</data>
             <constraint name="Magento\PageCache\Test\Constraint\AssertCacheFlushSuccessMessage" />
         </variation>
         <variation name="FlushJavaScriptCSSCacheTest">
+            <data name="tag" xsi:type="string">severity:S2</data>
             <data name="flushButtonName" xsi:type="string">Flush JavaScript/CSS Cache</data>
             <data name="successMessage" xsi:type="string">The JavaScript/CSS cache has been cleaned.</data>
             <constraint name="Magento\PageCache\Test\Constraint\AssertCacheFlushSuccessMessage" />
         </variation>
         <variation name="FlushStaticFilesCacheTest">
+            <data name="tag" xsi:type="string">severity:S2</data>
             <data name="flushButtonName" xsi:type="string">Flush Static Files Cache</data>
             <data name="successMessage" xsi:type="string">The static files cache has been cleaned.</data>
             <constraint name="Magento\PageCache\Test\Constraint\AssertCacheFlushSuccessMessage" />

dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.php

@@ -21,6 +21,7 @@ class FlushStaticFilesCacheButtonVisibilityTest extends Injectable
 {
     /* tags */
     const MVP = 'no';
+    const SEVERITY = 'S2';
     /* end tags */
 
     /**

dev/tests/functional/tests/app/Magento/PageCache/Test/TestCase/FlushStaticFilesCacheButtonVisibilityTest.xml

@@ -8,6 +8,7 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\PageCache\Test\TestCase\FlushStaticFilesCacheButtonVisibilityTest" summary="Flush Static Files Cache button visibility" ticketId="MAGETWO-39934">
         <variation name="FlushStaticFilesCacheButtonVisibilityTest">
+            <data name="tag" xsi:type="string">severity:S3</data>
             <constraint name="Magento\PageCache\Test\Constraint\AssertFlushStaticFilesCacheButtonVisibility" />
         </variation>
     </testCase>

dev/tests/functional/tests/app/Magento/PageCache/Test/etc/di.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+ -->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\PageCache\Test\Constraint\AssertCacheFlushSuccessMessage">
+        <arguments>
+            <argument name="severity" xsi:type="string">S2</argument>
+      </arguments>
+    </type>
+    <type name="Magento\PageCache\Test\Constraint\AssertCacheIsRefreshableAndInvalidated">
+        <arguments>
+            <argument name="severity" xsi:type="string">S2</argument>
+        </arguments>
+    </type>
+    <type name="Magento\PageCache\Test\Constraint\AssertFlushStaticFilesCacheButtonVisibility">
+        <arguments>
+            <argument name="severity" xsi:type="string">S3</argument>
+        </arguments>
+    </type>
+</config>