Merge pull request #103 from magento-tsg/MC-41539

MC-41539: [2.3.7] After running setup:upgrade, setup:db:check still says: Declarative Schema is not up to date
magento · Mar 29, 2021 · 2958369 · 2958369
2 parents 3d4163f + 03e2e08
commit 2958369
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/InventoryApi/Test/_files/stocks_rollback.php b/InventoryApi/Test/_files/stocks_rollback.php
@@ -11,9 +11,11 @@
 use Magento\InventorySalesApi\Api\Data\SalesChannelInterfaceFactory;
 use Magento\TestFramework\Helper\Bootstrap;
 
+$stockIds = [10, 20, 30];
+
 /** @var StockRepositoryInterface $stockRepository */
 $stockRepository = Bootstrap::getObjectManager()->get(StockRepositoryInterface::class);
-foreach ([10, 20, 30] as $stockId) {
+foreach ($stockIds as $stockId) {
     try {
         //Unassign sales channels from stocks in order to delete given stocks.
         $stockRepository = Bootstrap::getObjectManager()->get(StockRepositoryInterface::class);
@@ -31,4 +33,10 @@
 }
 
 $removeIndexData = Bootstrap::getObjectManager()->get(RemoveIndexData::class);
-$removeIndexData->execute([10, 20, 30]);
+foreach ($stockIds as $stockId) {
+    try {
+        $removeIndexData->execute([$stockId]);
+    } catch (\Zend_Db_Exception $e) {
+        //Index already removed
+    }
+}
diff --git a/InventoryLowQuantityNotification/Test/Integration/Model/RssFeedTest.php b/InventoryLowQuantityNotification/Test/Integration/Model/RssFeedTest.php
@@ -17,6 +17,7 @@
  * Test getRssData with different configuration on multi source inventory.
  *
  * @see https://app.hiptest.com/projects/69435/test-plan/folders/446482/scenarios/1651852
+ * @magentoDbIsolation disabled
  */
 class RssFeedTest extends TestCase
 {