MAGETWO-44154: Random PAT build failures due to 400/503 HTTP response errors being thrown

 - rename getResultFileName
 - re-introduce delay in sending requests in Installation test

Author: Dale Sikkema

dev/tests/integration/testsuite/Magento/Framework/Code/GeneratorTest.php

@@ -95,7 +95,7 @@ public function testGenerateClassFactoryWithNamespace()
         // This test is only valid if the factory created the object if Autoloader did not pick it up automatically
         if (\Magento\Framework\Code\Generator::GENERATION_SUCCESS == $generatorResult) {
             $content = $this->_clearDocBlock(
-                file_get_contents($this->_ioObject->getResultFileName(self::CLASS_NAME_WITH_NAMESPACE . 'Factory'))
+                file_get_contents($this->_ioObject->makeGeneratedClassFileName(self::CLASS_NAME_WITH_NAMESPACE . 'Factory'))
             );
             $expectedContent = $this->_clearDocBlock(
                 file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceFactory.php.sample')
@@ -120,7 +120,7 @@ public function testGenerateClassProxyWithNamespace()
         // This test is only valid if the factory created the object if Autoloader did not pick it up automatically
         if (\Magento\Framework\Code\Generator::GENERATION_SUCCESS == $generatorResult) {
             $content = $this->_clearDocBlock(
-                file_get_contents($this->_ioObject->getResultFileName(self::CLASS_NAME_WITH_NAMESPACE . '\Proxy'))
+                file_get_contents($this->_ioObject->makeGeneratedClassFileName(self::CLASS_NAME_WITH_NAMESPACE . '\Proxy'))
             );
             $expectedContent = $this->_clearDocBlock(
                 file_get_contents(__DIR__ . '/_expected/SourceClassWithNamespaceProxy.php.sample')
@@ -142,7 +142,7 @@ public function testGenerateClassInterceptorWithNamespace()
         if (\Magento\Framework\Code\Generator::GENERATION_SUCCESS == $generatorResult) {
             $content = $this->_clearDocBlock(
                 file_get_contents(
-                    $this->_ioObject->getResultFileName(self::CLASS_NAME_WITH_NAMESPACE . '\Interceptor')
+                    $this->_ioObject->makeGeneratedClassFileName(self::CLASS_NAME_WITH_NAMESPACE . '\Interceptor')
                 )
             );
             $expectedContent = $this->_clearDocBlock(

lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/EntityChildTestAbstract.php

@@ -109,7 +109,7 @@ public function testGenerate()
 
         //Mocking generation
         $this->ioObjectMock->expects($this->any())
-            ->method('getResultFileName')
+            ->method('makeGeneratedClassFileName')
             ->with($this->getResultClassName())
             ->willReturn($resultFileName);
         $this->ioObjectMock->expects($this->once())

lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/GenerateMapperTest.php

@@ -51,7 +51,7 @@ public function testGenerate()
         );
         $sampleMapperCode = file_get_contents(__DIR__ . '/_files/SampleMapper.txt');
         $this->ioObjectMock->expects($this->once())
-            ->method('getResultFileName')
+            ->method('makeGeneratedClassFileName')
             ->with('\Magento\Framework\Api\Code\Generator\SampleMapper')
             ->will($this->returnValue('SampleMapper.php'));
         $this->ioObjectMock->expects($this->once())

lib/internal/Magento/Framework/Api/Test/Unit/Code/Generator/GenerateSearchResultsTest.php

@@ -52,7 +52,7 @@ public function testGenerate()
         );
         $sampleSearchResultBuilderCode = file_get_contents(__DIR__ . '/_files/SampleSearchResults.txt');
         $this->ioObjectMock->expects($this->once())
-            ->method('getResultFileName')
+            ->method('makeGeneratedClassFileName')
             ->with('\Magento\Framework\Api\Code\Generator\SampleSearchResults')
             ->will($this->returnValue('SampleSearchResults.php'));
         $this->ioObjectMock->expects($this->once())

lib/internal/Magento/Framework/Code/Generator.php

@@ -191,7 +191,7 @@ protected function shouldSkipGeneration($resultEntityType, $sourceClassName, $re
         if (!$resultEntityType || !$sourceClassName) {
             return self::GENERATION_ERROR;
         } else if ($this->definedClasses->isClassLoadableFromDisc($resultClass)) {
-            $generatedFileName = $this->_ioObject->getResultFileName($resultClass);
+            $generatedFileName = $this->_ioObject->makeGeneratedClassFileName($resultClass);
             /**
              * Must handle two edge cases: a competing process has generated the class and written it to disc already,
              * or the class exists in committed code, despite matching pattern to be generated.

lib/internal/Magento/Framework/Code/Generator/EntityAbstract.php

@@ -97,7 +97,7 @@ public function generate()
             if ($this->_validateData()) {
                 $sourceCode = $this->_generateCode();
                 if ($sourceCode) {
-                    $fileName = $this->_ioObject->getResultFileName($this->_getResultClassName());
+                    $fileName = $this->_ioObject->makeGeneratedClassFileName($this->_getResultClassName());
                     $this->_ioObject->writeResultFile($fileName, $sourceCode);
                     return $fileName;
                 } else {

lib/internal/Magento/Framework/Code/Generator/Io.php

@@ -61,7 +61,7 @@ protected function initGeneratorDirectory($directory = null)
      */
     public function getResultFileDirectory($className)
     {
-        $fileName = $this->getResultFileName($className);
+        $fileName = $this->makeGeneratedClassFileName($className);
         $pathParts = explode('/', $fileName);
         unset($pathParts[count($pathParts) - 1]);
 
@@ -72,7 +72,7 @@ public function getResultFileDirectory($className)
      * @param string $className
      * @return string
      */
-    public function getResultFileName($className)
+    public function makeGeneratedClassFileName($className)
     {
         return $this->_generationDirectory . ltrim(str_replace(['\\', '_'], '/', $className), '/') . '.php';
     }

lib/internal/Magento/Framework/Code/Test/Unit/Generator/EntityAbstractTest.php

@@ -286,7 +286,7 @@ protected function _prepareMocksForGenerateCode($willWriteCode)
         if ($willWriteCode) {
             $ioObject->expects($this->once())->method('writeResultFile')->with(self::RESULT_FILE, self::RESULT_CODE);
         }
-        $ioObject->expects($this->any())->method('getResultFileName')->willReturn(self::RESULT_FILE);
+        $ioObject->expects($this->any())->method('makeGeneratedClassFileName')->willReturn(self::RESULT_FILE);
 
         return [
             'source_class' => $mocks['source_class'],

lib/internal/Magento/Framework/Code/Test/Unit/Generator/IoTest.php

@@ -72,7 +72,7 @@ public function testGetResultFileDirectory()
     public function testGetResultFileName()
     {
         $expectedFileName = self::GENERATION_DIRECTORY . '/class/name.php';
-        $this->assertEquals($expectedFileName, $this->_object->getResultFileName(self::CLASS_NAME));
+        $this->assertEquals($expectedFileName, $this->_object->makeGeneratedClassFileName(self::CLASS_NAME));
     }
 
     /**

lib/internal/Magento/Framework/Code/Test/Unit/GeneratorTest.php

@@ -120,7 +120,7 @@ public function testGenerateClassWithExistName($fileExists)
             ->willReturn(true);
 
         $resultClassFileName = '/Magento/Path/To/Class.php';
-        $this->ioObjectMock->expects($this->once())->method('getResultFileName')->willReturn($resultClassFileName);
+        $this->ioObjectMock->expects($this->once())->method('makeGeneratedClassFileName')->willReturn($resultClassFileName);
         $this->ioObjectMock->expects($this->once())->method('fileExists')->willReturn($fileExists);
         $includeFileInvokeCount = $fileExists ? 1 : 0;
         $this->ioObjectMock->expects($this->exactly($includeFileInvokeCount))->method('includeFile');