MAGETWO-72469: Merge 2.2-develop into develop

Author: slavvka

app/code/Magento/Sitemap/Test/Unit/Model/SitemapTest.php

@@ -408,7 +408,7 @@ protected function prepareSitemapModelMock(
         };
 
         // Check that all expected lines were written
-        $this->_fileMock->expects(
+        $this->fileMock->expects(
             $this->exactly($expectedWrites)
         )->method(
             'write'
@@ -420,8 +420,7 @@ protected function prepareSitemapModelMock(
             $currentFile = $file;
         };// Check that all expected file descriptors were created
         $this->directoryMock->expects($this->exactly(count($expectedFile)))->method('openFile')
-            ->willReturnCallback($checkFileCallback
-        );
+            ->willReturnCallback($checkFileCallback);
 
         // Check that all file descriptors were closed
         $this->fileMock->expects($this->exactly(count($expectedFile)))

dev/tests/integration/testsuite/Magento/Eav/Setup/EavSetupTest.php

@@ -55,7 +55,7 @@ public function addAttributeDataProvider()
     {
         return [
             ['eav_setup_test'],
-            ['_29_characters_29_characters_'],
+            ['_59_characters_59_characters_59_characters_59_characters_59'],
         ];
     }
 
@@ -86,7 +86,7 @@ public function addAttributeThrowExceptionDataProvider()
             [null],
             [''],
             [' '],
-            ['more_than_30_characters_more_than'],
+            ['more_than_60_characters_more_than_more_than_60_characters'],
         ];
     }