Merge remote-tracking branch 'mainline/develop' into bugfix

Author: Andrii Kasian

dev/tests/integration/framework/Magento/TestFramework/Annotation/DataFixture.php

@@ -158,6 +158,7 @@ protected function getDbIsolationState(\PHPUnit_Framework_TestCase $test)
      * Execute single fixture script
      *
      * @param string|array $fixture
+     * @throws \Exception
      */
     protected function _applyOneFixture($fixture)
     {
@@ -168,7 +169,9 @@ protected function _applyOneFixture($fixture)
                 require $fixture;
             }
         } catch (\Exception $e) {
-            echo 'Error in fixture: ', json_encode($fixture), PHP_EOL, $e;
+            throw new \Exception(
+                sprintf("Error in fixture: %s.\n %s", json_encode($fixture), $e->getMessage())
+            );
         }
     }
 
@@ -180,18 +183,14 @@ protected function _applyOneFixture($fixture)
      */
     protected function _applyFixtures(array $fixtures)
     {
-        try {
-            /* Execute fixture scripts */
-            foreach ($fixtures as $oneFixture) {
-                /* Skip already applied fixtures */
-                if (in_array($oneFixture, $this->_appliedFixtures, true)) {
-                    continue;
-                }
-                $this->_applyOneFixture($oneFixture);
-                $this->_appliedFixtures[] = $oneFixture;
+        /* Execute fixture scripts */
+        foreach ($fixtures as $oneFixture) {
+            /* Skip already applied fixtures */
+            if (in_array($oneFixture, $this->_appliedFixtures, true)) {
+                continue;
             }
-        } catch (\PDOException $e) {
-            echo $e;
+            $this->_applyOneFixture($oneFixture);
+            $this->_appliedFixtures[] = $oneFixture;
         }
     }
 

dev/tests/integration/framework/Magento/TestFramework/Event/Transaction.php

@@ -92,7 +92,15 @@ protected function _startTransaction(\PHPUnit_Framework_TestCase $test)
         if (!$this->_isTransactionActive) {
             $this->_getAdapter()->beginTransparentTransaction();
             $this->_isTransactionActive = true;
-            $this->_eventManager->fireEvent('startTransaction', [$test]);
+            try {
+                $this->_eventManager->fireEvent('startTransaction', [$test]);
+            } catch (\Exception $e) {
+                $test->getTestResultObject()->addFailure(
+                    $test,
+                    new \PHPUnit_Framework_AssertionFailedError($e->getMessage()),
+                    0
+                );
+            }
         }
     }
 

dev/tests/integration/testsuite/Magento/Checkout/Block/Cart/Item/RendererTest.php

@@ -39,6 +39,17 @@ protected function setUp()
         $this->_block->setItem($item);
     }
 
+    protected function tearDown()
+    {
+        /** @var $objectManager \Magento\TestFramework\ObjectManager */
+        $objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
+
+        $objectManager->removeSharedInstance('Magento\Checkout\Model\Session');
+        $objectManager->removeSharedInstance('Magento\Checkout\Model\Session\Storage');
+
+        unset($_SESSION);
+    }
+
     public function testThumbnail()
     {
         $size = $this->_block->getThumbnailSize();