DEVOPS-2174: Fix integration tests

Author: slavvka

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

@@ -171,8 +171,8 @@ 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 \PHPUnit_Framework_Exception(
+                sprintf("Error in fixture: %s.\n %s\n %s", json_encode($fixture), $e->getMessage(), $e->getTraceAsString()),
                 500,
                 $e
             );

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

@@ -138,8 +138,10 @@ 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 \PHPUnit_Framework_Exception(
+                sprintf("Error in fixture: %s.\n %s\n %s", json_encode($fixture), $e->getMessage(), $e->getTraceAsString()),
+                500,
+                $e
             );
         }
     }

dev/tests/integration/testsuite/Magento/Customer/Model/GroupManagementTest.php

@@ -15,7 +15,7 @@
 class GroupManagementTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * @var \Magento\Framework\ObjectManagerInterface
+     * @var \Magento\TestFramework\ObjectManager
      */
     protected $objectManager;
 
@@ -46,6 +46,9 @@ public function testGetDefaultGroupWithStoreId($testGroup, $storeId)
      */
     public function testGetDefaultGroupWithNonDefaultStoreId()
     {
+        $this->objectManager->removeSharedInstance('Magento\TestFramework\App\Config');
+        $this->objectManager->removeSharedInstance('Magento\Framework\App\Config\ScopeConfigInterface');
+
         /** @var \Magento\Store\Model\StoreManagerInterface  $storeManager */
         $storeManager = Bootstrap::getObjectManager()->get('Magento\Store\Model\StoreManagerInterface');
         $nonDefaultStore = $storeManager->getStore('secondstore');