Alter Tests to add new exception catches (plus a few main catches)

If a callback in commit throws an excecption, the calling plugin needs to be able to distinguish this from a unsuccessful commit, so that it doesn't attempt a rollback on an already commited transaction. (Which would cause an  “Asymmetric transaction rollback" error)

Author: waynetheisinger

app/code/Magento/Authorization/Model/ResourceModel/Rules.php

@@ -121,8 +121,6 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
 
             $connection->commit();
             $this->aclDataCache->clean();
-        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
-            throw $e->getPrevious();
         } catch (\Magento\Framework\Exception\LocalizedException $e) {
             $connection->rollBack();
             throw $e;

app/code/Magento/Sales/Model/Order/Status.php

@@ -77,6 +77,8 @@ public function assignState($state, $isDefault = false, $visibleOnFront = false)
         try {
             $resource->assignState($this->getStatus(), $state, $isDefault, $visibleOnFront);
             $resource->commit();
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $e) {
             $resource->rollBack();
             throw $e;

app/code/Magento/Store/Model/Config/Importer.php

@@ -105,6 +105,8 @@ public function import(array $data)
             foreach ($actions as $action) {
                 $this->processFactory->create($action)->run($data);
             }
+        } catch (\Magento\Framework\Exception\AfterCommitException $e) {
+            throw $e->getPrevious();
         } catch (\Exception $exception) {
             $this->resource->rollBack();
             $this->reinitStores();

dev/tests/integration/testsuite/Magento/Reports/_files/viewed_products.php

@@ -54,6 +54,8 @@
 try {
     $reportResource->aggregate();
     $reportResource->commit();
+} catch (\Magento\Framework\Exception\AfterCommitException $e) {
+    throw $e->getPrevious();
 } catch (\Exception $e) {
     $reportResource->rollBack();
     throw $e;

dev/tests/integration/testsuite/Magento/Sales/_files/report_bestsellers.php

@@ -14,6 +14,8 @@
 try {
     $reportResource->aggregate();
     $reportResource->commit();
+} catch (\Magento\Framework\Exception\AfterCommitException $e) {
+    throw $e->getPrevious();
 } catch (\Exception $e) {
     $reportResource->rollBack();
     throw $e;

dev/tests/integration/testsuite/Magento/Sales/_files/report_invoiced.php

@@ -14,6 +14,8 @@
 try {
     $reportResource->aggregate();
     $reportResource->commit();
+} catch (\Magento\Framework\Exception\AfterCommitException $e) {
+    throw $e->getPrevious();
 } catch (\Exception $e) {
     $reportResource->rollBack();
     throw $e;

dev/tests/integration/testsuite/Magento/Sales/_files/report_refunded.php

@@ -14,6 +14,8 @@
 try {
     $reportResource->aggregate();
     $reportResource->commit();
+} catch (\Magento\Framework\Exception\AfterCommitException $e) {
+    throw $e->getPrevious();
 } catch (\Exception $e) {
     $reportResource->rollBack();
     throw $e;

dev/tests/integration/testsuite/Magento/Sales/_files/report_shipping.php

@@ -14,6 +14,8 @@
 try {
     $reportResource->aggregate();
     $reportResource->commit();
+} catch (\Magento\Framework\Exception\AfterCommitException $e) {
+    throw $e->getPrevious();
 } catch (\Exception $e) {
     $reportResource->rollBack();
     throw $e;

dev/tests/integration/testsuite/Magento/SalesRule/_files/report_coupons.php

@@ -14,6 +14,8 @@
 try {
     $reportResource->aggregate();
     $reportResource->commit();
+} catch (\Magento\Framework\Exception\AfterCommitException $e) {
+    throw $e->getPrevious();
 } catch (\Exception $e) {
     $reportResource->rollBack();
     throw $e;

dev/tests/integration/testsuite/Magento/Tax/_files/report_tax.php

@@ -13,6 +13,8 @@
 try {
     $reportResource->aggregate();
     $reportResource->commit();
+} catch (\Magento\Framework\Exception\AfterCommitException $e) {
+    throw $e->getPrevious();
 } catch (\Exception $e) {
     $reportResource->rollBack();
     throw $e;