Merge pull request #2501 from magento-borg/DEVOPS-2174

Fixed issues: - DEVOPS-232 Static Testing in Jenkins
magento · May 9, 2018 · b16dfc6 · b16dfc6
2 parents fb5eccf + 8b02375
commit b16dfc6
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php b/dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\TestFramework\Annotation;
 
+use PHPUnit\Framework\Exception;
+
 class DataFixture
 {
     /**
@@ -171,8 +173,13 @@ protected function _applyOneFixture($fixture)
                 require $fixture;
             }
         } catch (\Exception $e) {
-            throw new \Exception(
-                sprintf("Error in fixture: %s.\n %s", json_encode($fixture), $e->getMessage()),
+            throw new Exception(
+                sprintf(
+                    "Error in fixture: %s.\n %s\n %s",
+                    json_encode($fixture),
+                    $e->getMessage(),
+                    $e->getTraceAsString()
+                ),
                 500,
                 $e
             );

diff --git a/...s/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php b/...s/integration/framework/Magento/TestFramework/Annotation/DataFixtureBeforeTransaction.php
@@ -9,6 +9,8 @@
  */
 namespace Magento\TestFramework\Annotation;
 
+use PHPUnit\Framework\Exception;
+
 class DataFixtureBeforeTransaction
 {
     /**
@@ -138,8 +140,15 @@ protected function _applyOneFixture($fixture)
                 require $fixture;
             }
         } catch (\Exception $e) {
-            throw new \Exception(
-                sprintf("Error in fixture: %s.\n %s", json_encode($fixture), (string)$e)
+            throw new Exception(
+                sprintf(
+                    "Error in fixture: %s.\n %s\n %s",
+                    json_encode($fixture),
+                    $e->getMessage(),
+                    $e->getTraceAsString()
+                ),
+                500,
+                $e
             );
         }
     }

diff --git a/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php b/dev/tests/integration/testsuite/Magento/Framework/TranslateCachingTest.php
@@ -48,7 +48,7 @@ public function testLoadDataCaching()
         /** @var \Magento\Framework\Translate $model */
         $model = $this->objectManager->get(\Magento\Framework\Translate::class);
 
-        $model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND); // this is supposed to cache the fixture
+        $model->loadData(\Magento\Framework\App\Area::AREA_FRONTEND, true); // this is supposed to cache the fixture
         $this->assertEquals('Fixture Db Translation', new Phrase('Fixture String'));
 
         /** @var \Magento\Translation\Model\ResourceModel\StringUtils $translateString */

diff --git a/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php b/dev/tests/integration/testsuite/Magento/MessageQueue/Model/Cron/ConsumersRunnerTest.php
@@ -19,6 +19,7 @@
  * Tests the different cases of consumers running by ConsumersRunner
  *
  * {@inheritdoc}
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ConsumersRunnerTest extends \PHPUnit\Framework\TestCase
 {
@@ -104,7 +105,7 @@ protected function setUp()
                 $command = str_replace('bin/magento', 'dev/tests/integration/bin/magento', $command);
                 $command = $params . ' ' . $command;
 
-                return exec("{$command} > /dev/null &");
+                return exec("{$command} >/dev/null &");
             });
     }