Skip to content

Commit 0d42133

Browse files
Revert "Alter Tests to add new exception catches (plus a few main catches)"
This reverts commit 95c2ae9.
1 parent 973eb08 commit 0d42133

File tree

11 files changed

+2
-20
lines changed

11 files changed

+2
-20
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ public function saveRel(\Magento\Authorization\Model\Rules $rule)
121121

122122
$connection->commit();
123123
$this->aclDataCache->clean();
124+
} catch (\Magento\Framework\Exception\AfterCommitException $e) {
125+
throw $e->getPrevious();
124126
} catch (\Magento\Framework\Exception\LocalizedException $e) {
125127
$connection->rollBack();
126128
throw $e;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ public function assignState($state, $isDefault = false, $visibleOnFront = false)
7777
try {
7878
$resource->assignState($this->getStatus(), $state, $isDefault, $visibleOnFront);
7979
$resource->commit();
80-
} catch (\Magento\Framework\Exception\AfterCommitException $e) {
81-
throw $e->getPrevious();
8280
} catch (\Exception $e) {
8381
$resource->rollBack();
8482
throw $e;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,6 @@ public function import(array $data)
105105
foreach ($actions as $action) {
106106
$this->processFactory->create($action)->run($data);
107107
}
108-
} catch (\Magento\Framework\Exception\AfterCommitException $e) {
109-
throw $e->getPrevious();
110108
} catch (\Exception $exception) {
111109
$this->resource->rollBack();
112110
$this->reinitStores();

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,6 @@
5454
try {
5555
$reportResource->aggregate();
5656
$reportResource->commit();
57-
} catch (\Magento\Framework\Exception\AfterCommitException $e) {
58-
throw $e->getPrevious();
5957
} catch (\Exception $e) {
6058
$reportResource->rollBack();
6159
throw $e;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
try {
1515
$reportResource->aggregate();
1616
$reportResource->commit();
17-
} catch (\Magento\Framework\Exception\AfterCommitException $e) {
18-
throw $e->getPrevious();
1917
} catch (\Exception $e) {
2018
$reportResource->rollBack();
2119
throw $e;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
try {
1515
$reportResource->aggregate();
1616
$reportResource->commit();
17-
} catch (\Magento\Framework\Exception\AfterCommitException $e) {
18-
throw $e->getPrevious();
1917
} catch (\Exception $e) {
2018
$reportResource->rollBack();
2119
throw $e;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
try {
1515
$reportResource->aggregate();
1616
$reportResource->commit();
17-
} catch (\Magento\Framework\Exception\AfterCommitException $e) {
18-
throw $e->getPrevious();
1917
} catch (\Exception $e) {
2018
$reportResource->rollBack();
2119
throw $e;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
try {
1515
$reportResource->aggregate();
1616
$reportResource->commit();
17-
} catch (\Magento\Framework\Exception\AfterCommitException $e) {
18-
throw $e->getPrevious();
1917
} catch (\Exception $e) {
2018
$reportResource->rollBack();
2119
throw $e;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@
1414
try {
1515
$reportResource->aggregate();
1616
$reportResource->commit();
17-
} catch (\Magento\Framework\Exception\AfterCommitException $e) {
18-
throw $e->getPrevious();
1917
} catch (\Exception $e) {
2018
$reportResource->rollBack();
2119
throw $e;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
try {
1414
$reportResource->aggregate();
1515
$reportResource->commit();
16-
} catch (\Magento\Framework\Exception\AfterCommitException $e) {
17-
throw $e->getPrevious();
1816
} catch (\Exception $e) {
1917
$reportResource->rollBack();
2018
throw $e;

0 commit comments

Comments
 (0)